Diff of /trunk/ModularRex/RexParts/ModrexObjects.cs
Parent Directory
| 
Revision Log
| 
Patch
| 284 |
|
|
| 285 |
if (p.RexCollisionMeshUUID != UUID.Zero && sop.PhysActor is IRexPhysicsActor) |
if (p.RexCollisionMeshUUID != UUID.Zero && sop.PhysActor is IRexPhysicsActor) |
| 286 |
{ |
{ |
| 287 |
AssetBase tempmodel = sop.ParentGroup.Scene.AssetCache.GetAsset(p.RexCollisionMeshUUID, false); |
AssetBase tempmodel = sop.ParentGroup.Scene.CommsManager.AssetCache.GetAsset(p.RexCollisionMeshUUID, false); |
| 288 |
if (tempmodel != null) |
if (tempmodel != null) |
| 289 |
((IRexPhysicsActor)sop.PhysActor).SetCollisionMesh(tempmodel.Data, tempmodel.Metadata.Name, p.RexScaleToPrim); |
((IRexPhysicsActor)sop.PhysActor).SetCollisionMesh(tempmodel.Data, tempmodel.Name, p.RexScaleToPrim); |
| 290 |
} |
} |
| 291 |
} |
} |
| 292 |
|
|
| 293 |
public byte GetAssetType(UUID assetid) |
public byte GetAssetType(UUID assetid) |
| 294 |
{ |
{ |
| 295 |
AssetBase tempmodel = m_scenes[0].AssetCache.GetAsset(assetid, true); |
AssetBase tempmodel = m_scenes[0].CommsManager.AssetCache.GetAsset(assetid, true); |
| 296 |
if (tempmodel == null) |
if (tempmodel == null) |
| 297 |
m_scenes[0].AssetCache.GetAsset(assetid, false); |
m_scenes[0].CommsManager.AssetCache.GetAsset(assetid, false); |
| 298 |
|
|
| 299 |
if (tempmodel != null) |
if (tempmodel != null) |
| 300 |
return(byte)(tempmodel.Metadata.Type); |
return(byte)(tempmodel.Type); |
| 301 |
else |
else |
| 302 |
return 0; |
return 0; |
| 303 |
} |
} |
|
|
Legend:
| Removed from v.69 |
|
| changed lines |
| |
Added in v.72 |
|
|
