diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 6b5883e..9a455ae 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1414,8 +1414,7 @@ if (m_shape != null) { | |||
1414 | { | 1414 | { |
1415 | if (dupe.m_shape.SculptEntry && dupe.m_shape.SculptTexture != UUID.Zero) | 1415 | if (dupe.m_shape.SculptEntry && dupe.m_shape.SculptTexture != UUID.Zero) |
1416 | { | 1416 | { |
1417 | m_parentGroup.Scene.CommsManager.AssetCache.GetAsset( | 1417 | m_parentGroup.Scene.AssetService.Get(dupe.m_shape.SculptTexture.ToString(), dupe, AssetReceived); |
1418 | dupe.m_shape.SculptTexture, dupe.SculptTextureCallback, true); | ||
1419 | } | 1418 | } |
1420 | 1419 | ||
1421 | bool UsePhysics = ((dupe.ObjectFlags & (uint)PrimFlags.Physics) != 0); | 1420 | bool UsePhysics = ((dupe.ObjectFlags & (uint)PrimFlags.Physics) != 0); |
@@ -1425,6 +1424,16 @@ if (m_shape != null) { | |||
1425 | return dupe; | 1424 | return dupe; |
1426 | } | 1425 | } |
1427 | 1426 | ||
1427 | protected void AssetReceived(string id, Object sender, AssetBase asset) | ||
1428 | { | ||
1429 | if (asset != null) | ||
1430 | { | ||
1431 | SceneObjectPart sop = (SceneObjectPart)sender; | ||
1432 | if (sop != null) | ||
1433 | sop.SculptTextureCallback(asset.FullID, asset); | ||
1434 | } | ||
1435 | } | ||
1436 | |||
1428 | public static SceneObjectPart Create() | 1437 | public static SceneObjectPart Create() |
1429 | { | 1438 | { |
1430 | SceneObjectPart part = new SceneObjectPart(); | 1439 | SceneObjectPart part = new SceneObjectPart(); |
@@ -3147,8 +3156,7 @@ if (m_shape != null) { | |||
3147 | { | 3156 | { |
3148 | if (m_shape.SculptEntry && m_shape.SculptTexture != UUID.Zero) | 3157 | if (m_shape.SculptEntry && m_shape.SculptTexture != UUID.Zero) |
3149 | { | 3158 | { |
3150 | m_parentGroup.Scene.CommsManager.AssetCache.GetAsset( | 3159 | m_parentGroup.Scene.AssetService.Get(m_shape.SculptTexture.ToString(), this, AssetReceived); |
3151 | m_shape.SculptTexture, SculptTextureCallback, true); | ||
3152 | } | 3160 | } |
3153 | } | 3161 | } |
3154 | 3162 | ||