Diff of /branches/taiga-0.1/ModularRex/RexParts/ModrexObjects.cs
Parent Directory
| 
Revision Log
| 
Patch
| revision 147, Thu May 14 16:28:28 2009 UTC | revision 153, Tue May 19 06:18:18 2009 UTC | |
|---|---|---|
| # | Line 306 | Line 306 |
| 306 | ||
| 307 | if (p.RexCollisionMeshUUID != UUID.Zero && sop.PhysActor is IRexPhysicsActor) | if (p.RexCollisionMeshUUID != UUID.Zero && sop.PhysActor is IRexPhysicsActor) |
| 308 | { | { |
| 309 | AssetBase tempmodel = sop.ParentGroup.Scene.CommsManager.AssetCache.GetAsset(p.RexCollisionMeshUUID, false); | AssetBase tempmodel = sop.ParentGroup.Scene.AssetService.Get(p.RexCollisionMeshUUID.ToString()); |
| 310 | if (tempmodel != null) | if (tempmodel != null) |
| 311 | ((IRexPhysicsActor)sop.PhysActor).SetCollisionMesh(tempmodel.Data, tempmodel.Name, p.RexScaleToPrim); | ((IRexPhysicsActor)sop.PhysActor).SetCollisionMesh(tempmodel.Data, tempmodel.Name, p.RexScaleToPrim); |
| 312 | } | } |
| # | Line 314 | Line 314 |
| 314 | ||
| 315 | public byte GetAssetType(UUID assetid) | public byte GetAssetType(UUID assetid) |
| 316 | { | { |
| 317 | AssetBase tempmodel = m_scenes[0].CommsManager.AssetCache.GetAsset(assetid, true); | AssetBase tempmodel = m_scenes[0].AssetService.Get(assetid.ToString()); |
| 318 | if (tempmodel == null) | if (tempmodel == null) |
| 319 | m_scenes[0].CommsManager.AssetCache.GetAsset(assetid, false); | m_scenes[0].AssetService.Get(assetid.ToString()); |
| 320 | ||
| 321 | if (tempmodel != null) | if (tempmodel != null) |
| 322 | return(byte)(tempmodel.Type); | return(byte)(tempmodel.Type); |
|
||||||||
| ViewVC Help | |
| Powered by ViewVC 1.0.0 |
