aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-02-16 19:15:16 +0000
committerJustin Clarke Casey2009-02-16 19:15:16 +0000
commit93837807ffb24e5811368063b9231a9d8b018d9d (patch)
tree5da8dcbc3fd6e6e4c7003e486f0ad26bd7c43d87 /OpenSim/Region/ScriptEngine
parent* Iniital inventory archive test code. Doesn't actually do any testing yet (diff)
downloadopensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.zip
opensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.tar.gz
opensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.tar.bz2
opensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.tar.xz
* refactor: remove AssetCache field hanging off Scene
* This is always available at Scene.CommsManager.AssetCache
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 9f5d143..e5f097f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3549,7 +3549,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3549 World.RegionInfo.RegionLocY * Constants.RegionSize, 3549 World.RegionInfo.RegionLocY * Constants.RegionSize,
3550 0); 3550 0);
3551 3551
3552 World.AssetCache.GetAsset(item.AssetID, 3552 World.CommsManager.AssetCache.GetAsset(item.AssetID,
3553 delegate(UUID i, AssetBase a) 3553 delegate(UUID i, AssetBase a)
3554 { 3554 {
3555 AssetLandmark lm = new AssetLandmark(a); 3555 AssetLandmark lm = new AssetLandmark(a);
@@ -8851,7 +8851,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8851 public delegate void AssetRequestCallback(UUID assetID, AssetBase asset); 8851 public delegate void AssetRequestCallback(UUID assetID, AssetBase asset);
8852 private void WithNotecard(UUID assetID, AssetRequestCallback cb) 8852 private void WithNotecard(UUID assetID, AssetRequestCallback cb)
8853 { 8853 {
8854 World.AssetCache.GetAsset(assetID, delegate(UUID i, AssetBase a) { cb(i, a); }, false); 8854 World.CommsManager.AssetCache.GetAsset(assetID, delegate(UUID i, AssetBase a) { cb(i, a); }, false);
8855 } 8855 }
8856 8856
8857 public LSL_String llGetNumberOfNotecardLines(string name) 8857 public LSL_String llGetNumberOfNotecardLines(string name)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 9658376..e4ef236 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1040,7 +1040,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1040 + textLength.ToString() + "\n" + notecardData + "}\n"; 1040 + textLength.ToString() + "\n" + notecardData + "}\n";
1041 1041
1042 asset.Data = Encoding.ASCII.GetBytes(notecardData); 1042 asset.Data = Encoding.ASCII.GetBytes(notecardData);
1043 World.AssetCache.AddAsset(asset); 1043 World.CommsManager.AssetCache.AddAsset(asset);
1044 1044
1045 // Create Task Entry 1045 // Create Task Entry
1046 TaskInventoryItem taskItem=new TaskInventoryItem(); 1046 TaskInventoryItem taskItem=new TaskInventoryItem();