diff options
Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only.
This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing.
Known problems:
* HG asset transfers are borked for now
* missing texture is missing
* 3 unit tests commented out for now
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 8a06fd1..e0a50a1 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2967,8 +2967,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2967 | { | 2967 | { |
2968 | if (part.Shape.SculptEntry && part.Shape.SculptTexture != UUID.Zero) | 2968 | if (part.Shape.SculptEntry && part.Shape.SculptTexture != UUID.Zero) |
2969 | { | 2969 | { |
2970 | m_scene.CommsManager.AssetCache.GetAsset( | 2970 | m_scene.AssetService.Get( |
2971 | part.Shape.SculptTexture, part.SculptTextureCallback, true); | 2971 | part.Shape.SculptTexture.ToString(), part, AssetReceived); |
2972 | } | 2972 | } |
2973 | } | 2973 | } |
2974 | } | 2974 | } |
@@ -2976,6 +2976,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
2976 | } | 2976 | } |
2977 | } | 2977 | } |
2978 | 2978 | ||
2979 | protected void AssetReceived(string id, Object sender, AssetBase asset) | ||
2980 | { | ||
2981 | if (asset != null) | ||
2982 | { | ||
2983 | SceneObjectPart sop = (SceneObjectPart)sender; | ||
2984 | if (sop != null) | ||
2985 | sop.SculptTextureCallback(asset.FullID, asset); | ||
2986 | } | ||
2987 | } | ||
2988 | |||
2979 | /// <summary> | 2989 | /// <summary> |
2980 | /// Set the user group to which this scene object belongs. | 2990 | /// Set the user group to which this scene object belongs. |
2981 | /// </summary> | 2991 | /// </summary> |