diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 9020ff9..d4fc2d1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3782,8 +3782,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3782 | World.RegionInfo.RegionLocY * Constants.RegionSize, | 3782 | World.RegionInfo.RegionLocY * Constants.RegionSize, |
3783 | 0); | 3783 | 0); |
3784 | 3784 | ||
3785 | World.CommsManager.AssetCache.GetAsset(item.AssetID, | 3785 | World.AssetService.Get(item.AssetID.ToString(), this, |
3786 | delegate(UUID i, AssetBase a) | 3786 | delegate(string i, object sender, AssetBase a) |
3787 | { | 3787 | { |
3788 | AssetLandmark lm = new AssetLandmark(a); | 3788 | AssetLandmark lm = new AssetLandmark(a); |
3789 | 3789 | ||
@@ -3795,7 +3795,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3795 | AsyncCommands. | 3795 | AsyncCommands. |
3796 | DataserverPlugin.DataserverReply(i.ToString(), | 3796 | DataserverPlugin.DataserverReply(i.ToString(), |
3797 | reply); | 3797 | reply); |
3798 | }, false); | 3798 | }); |
3799 | 3799 | ||
3800 | // ScriptSleep(1000); | 3800 | // ScriptSleep(1000); |
3801 | return tid.ToString(); | 3801 | return tid.ToString(); |
@@ -9311,7 +9311,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9311 | public delegate void AssetRequestCallback(UUID assetID, AssetBase asset); | 9311 | public delegate void AssetRequestCallback(UUID assetID, AssetBase asset); |
9312 | private void WithNotecard(UUID assetID, AssetRequestCallback cb) | 9312 | private void WithNotecard(UUID assetID, AssetRequestCallback cb) |
9313 | { | 9313 | { |
9314 | World.CommsManager.AssetCache.GetAsset(assetID, delegate(UUID i, AssetBase a) { cb(i, a); }, false); | 9314 | World.AssetService.Get(assetID.ToString(), this, |
9315 | delegate(string i, object sender, AssetBase a) | ||
9316 | { | ||
9317 | UUID uuid = UUID.Zero; | ||
9318 | UUID.TryParse(i, out uuid); | ||
9319 | cb(uuid, a); | ||
9320 | }); | ||
9315 | } | 9321 | } |
9316 | 9322 | ||
9317 | public LSL_String llGetNumberOfNotecardLines(string name) | 9323 | public LSL_String llGetNumberOfNotecardLines(string name) |