aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs20
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 0c6ad0d..c98629b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -191,7 +191,7 @@ namespace OpenSim.Region.Framework.Scenes
191 191
192 AssetBase asset = 192 AssetBase asset =
193 CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data); 193 CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data);
194 AssetCache.AddAsset(asset); 194 CommsManager.AssetCache.AddAsset(asset);
195 195
196 item.AssetID = asset.Metadata.FullID; 196 item.AssetID = asset.Metadata.FullID;
197 userInfo.UpdateItem(item); 197 userInfo.UpdateItem(item);
@@ -277,7 +277,7 @@ namespace OpenSim.Region.Framework.Scenes
277 } 277 }
278 278
279 AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data); 279 AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data);
280 AssetCache.AddAsset(asset); 280 CommsManager.AssetCache.AddAsset(asset);
281 281
282 if (isScriptRunning) 282 if (isScriptRunning)
283 { 283 {
@@ -681,7 +681,7 @@ namespace OpenSim.Region.Framework.Scenes
681 } 681 }
682 682
683 AssetBase asset 683 AssetBase asset
684 = AssetCache.GetAsset( 684 = CommsManager.AssetCache.GetAsset(
685 item.AssetID, (item.AssetType == (int)AssetType.Texture ? true : false)); 685 item.AssetID, (item.AssetType == (int)AssetType.Texture ? true : false));
686 686
687 if (asset != null) 687 if (asset != null)
@@ -903,7 +903,7 @@ namespace OpenSim.Region.Framework.Scenes
903 } 903 }
904 904
905 AssetBase asset = CreateAsset(name, description, assetType, data); 905 AssetBase asset = CreateAsset(name, description, assetType, data);
906 AssetCache.AddAsset(asset); 906 CommsManager.AssetCache.AddAsset(asset);
907 907
908 CreateNewInventoryItem(remoteClient, folderID, asset.Metadata.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate); 908 CreateNewInventoryItem(remoteClient, folderID, asset.Metadata.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate);
909 } 909 }
@@ -1530,7 +1530,7 @@ namespace OpenSim.Region.Framework.Scenes
1530 return; 1530 return;
1531 1531
1532 AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType, Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}")); 1532 AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType, Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}"));
1533 AssetCache.AddAsset(asset); 1533 CommsManager.AssetCache.AddAsset(asset);
1534 1534
1535 TaskInventoryItem taskItem = new TaskInventoryItem(); 1535 TaskInventoryItem taskItem = new TaskInventoryItem();
1536 1536
@@ -1952,7 +1952,7 @@ namespace OpenSim.Region.Framework.Scenes
1952 objectGroup.GetPartDescription(objectGroup.RootPart.LocalId), 1952 objectGroup.GetPartDescription(objectGroup.RootPart.LocalId),
1953 (sbyte)AssetType.Object, 1953 (sbyte)AssetType.Object,
1954 Utils.StringToBytes(sceneObjectXml)); 1954 Utils.StringToBytes(sceneObjectXml));
1955 AssetCache.AddAsset(asset); 1955 CommsManager.AssetCache.AddAsset(asset);
1956 assetID = asset.Metadata.FullID; 1956 assetID = asset.Metadata.FullID;
1957 1957
1958 if (DeRezAction.SaveToExistingUserInventoryItem == action) 1958 if (DeRezAction.SaveToExistingUserInventoryItem == action)
@@ -2078,7 +2078,7 @@ namespace OpenSim.Region.Framework.Scenes
2078 objectGroup.GetPartDescription(objectGroup.LocalId), 2078 objectGroup.GetPartDescription(objectGroup.LocalId),
2079 (sbyte)AssetType.Object, 2079 (sbyte)AssetType.Object,
2080 Utils.StringToBytes(sceneObjectXml)); 2080 Utils.StringToBytes(sceneObjectXml));
2081 AssetCache.AddAsset(asset); 2081 CommsManager.AssetCache.AddAsset(asset);
2082 2082
2083 item.AssetID = asset.Metadata.FullID; 2083 item.AssetID = asset.Metadata.FullID;
2084 item.Description = asset.Metadata.Description; 2084 item.Description = asset.Metadata.Description;
@@ -2115,7 +2115,7 @@ namespace OpenSim.Region.Framework.Scenes
2115 grp.GetPartDescription(grp.LocalId), 2115 grp.GetPartDescription(grp.LocalId),
2116 (sbyte)AssetType.Object, 2116 (sbyte)AssetType.Object,
2117 Utils.StringToBytes(sceneObjectXml)); 2117 Utils.StringToBytes(sceneObjectXml));
2118 AssetCache.AddAsset(asset); 2118 CommsManager.AssetCache.AddAsset(asset);
2119 2119
2120 InventoryItemBase item = new InventoryItemBase(); 2120 InventoryItemBase item = new InventoryItemBase();
2121 item.Creator = grp.RootPart.CreatorID; 2121 item.Creator = grp.RootPart.CreatorID;
@@ -2239,7 +2239,7 @@ namespace OpenSim.Region.Framework.Scenes
2239 2239
2240 if (item != null) 2240 if (item != null)
2241 { 2241 {
2242 AssetBase rezAsset = AssetCache.GetAsset(item.AssetID, false); 2242 AssetBase rezAsset = CommsManager.AssetCache.GetAsset(item.AssetID, false);
2243 2243
2244 if (rezAsset != null) 2244 if (rezAsset != null)
2245 { 2245 {
@@ -2407,7 +2407,7 @@ namespace OpenSim.Region.Framework.Scenes
2407 { 2407 {
2408 UUID ownerID = item.OwnerID; 2408 UUID ownerID = item.OwnerID;
2409 2409
2410 AssetBase rezAsset = AssetCache.GetAsset(item.AssetID, false); 2410 AssetBase rezAsset = CommsManager.AssetCache.GetAsset(item.AssetID, false);
2411 2411
2412 if (rezAsset != null) 2412 if (rezAsset != null)
2413 { 2413 {