aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs38
1 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 17f7566..138cb20 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.Environment.Scenes
52 52
53 public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item) 53 public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item)
54 { 54 {
55 CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); 55 CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
56 if (userInfo != null) 56 if (userInfo != null)
57 { 57 {
58 userInfo.AddItem(remoteClient.AgentId, item); 58 userInfo.AddItem(remoteClient.AgentId, item);
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Environment.Scenes
74 74
75 public LLUUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID itemID, byte[] data) 75 public LLUUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID itemID, byte[] data)
76 { 76 {
77 CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); 77 CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
78 if (userInfo != null) 78 if (userInfo != null)
79 { 79 {
80 if (userInfo.RootFolder != null) 80 if (userInfo.RootFolder != null)
@@ -89,7 +89,7 @@ namespace OpenSim.Region.Environment.Scenes
89 asset.InvType = (sbyte) item.invType; 89 asset.InvType = (sbyte) item.invType;
90 asset.Name = item.inventoryName; 90 asset.Name = item.inventoryName;
91 asset.Data = data; 91 asset.Data = data;
92 commsManager.AssetCache.AddAsset(asset); 92 AssetCache.AddAsset(asset);
93 93
94 item.assetID = asset.FullID; 94 item.assetID = asset.FullID;
95 userInfo.UpdateItem(remoteClient.AgentId, item); 95 userInfo.UpdateItem(remoteClient.AgentId, item);
@@ -114,7 +114,7 @@ namespace OpenSim.Region.Environment.Scenes
114 public void UDPUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, 114 public void UDPUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID,
115 LLUUID itemID) 115 LLUUID itemID)
116 { 116 {
117 CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); 117 CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
118 if (userInfo != null) 118 if (userInfo != null)
119 { 119 {
120 if (userInfo.RootFolder != null) 120 if (userInfo.RootFolder != null)
@@ -123,13 +123,13 @@ namespace OpenSim.Region.Environment.Scenes
123 if (item != null) 123 if (item != null)
124 { 124 {
125 AgentAssetTransactions transactions = 125 AgentAssetTransactions transactions =
126 commsManager.TransactionsManager.GetUserTransActions(remoteClient.AgentId); 126 CommsManager.TransactionsManager.GetUserTransActions(remoteClient.AgentId);
127 if (transactions != null) 127 if (transactions != null)
128 { 128 {
129 AssetBase asset = null; 129 AssetBase asset = null;
130 bool addToCache = false; 130 bool addToCache = false;
131 131
132 asset = commsManager.AssetCache.GetAsset(assetID); 132 asset = AssetCache.GetAsset(assetID);
133 if (asset == null) 133 if (asset == null)
134 { 134 {
135 asset = transactions.GetTransactionAsset(transactionID); 135 asset = transactions.GetTransactionAsset(transactionID);
@@ -148,7 +148,7 @@ namespace OpenSim.Region.Environment.Scenes
148 148
149 if (addToCache) 149 if (addToCache)
150 { 150 {
151 commsManager.AssetCache.AddAsset(asset); 151 AssetCache.AddAsset(asset);
152 } 152 }
153 153
154 userInfo.UpdateItem(remoteClient.AgentId, item); 154 userInfo.UpdateItem(remoteClient.AgentId, item);
@@ -179,7 +179,7 @@ namespace OpenSim.Region.Environment.Scenes
179 { 179 {
180 if (transActionID == LLUUID.Zero) 180 if (transActionID == LLUUID.Zero)
181 { 181 {
182 CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); 182 CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
183 if (userInfo != null) 183 if (userInfo != null)
184 { 184 {
185 AssetBase asset = new AssetBase(); 185 AssetBase asset = new AssetBase();
@@ -189,7 +189,7 @@ namespace OpenSim.Region.Environment.Scenes
189 asset.Type = type; 189 asset.Type = type;
190 asset.FullID = LLUUID.Random(); 190 asset.FullID = LLUUID.Random();
191 asset.Data = new byte[1]; 191 asset.Data = new byte[1];
192 commsManager.AssetCache.AddAsset(asset); 192 AssetCache.AddAsset(asset);
193 193
194 InventoryItemBase item = new InventoryItemBase(); 194 InventoryItemBase item = new InventoryItemBase();
195 item.avatarID = remoteClient.AgentId; 195 item.avatarID = remoteClient.AgentId;
@@ -210,7 +210,7 @@ namespace OpenSim.Region.Environment.Scenes
210 } 210 }
211 else 211 else
212 { 212 {
213 commsManager.TransactionsManager.HandleInventoryFromTransaction(remoteClient, transActionID, folderID, 213 CommsManager.TransactionsManager.HandleInventoryFromTransaction(remoteClient, transActionID, folderID,
214 callbackID, description, name, invType, 214 callbackID, description, name, invType,
215 type, wearableType, nextOwnerMask); 215 type, wearableType, nextOwnerMask);
216 //System.Console.WriteLine("request to create inventory item from transaction " + transActionID); 216 //System.Console.WriteLine("request to create inventory item from transaction " + transActionID);
@@ -269,7 +269,7 @@ namespace OpenSim.Region.Environment.Scenes
269 269
270 public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID) 270 public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID)
271 { 271 {
272 CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); 272 CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
273 LLUUID copyID = LLUUID.Random(); 273 LLUUID copyID = LLUUID.Random();
274 if (userInfo != null) 274 if (userInfo != null)
275 { 275 {
@@ -284,7 +284,7 @@ namespace OpenSim.Region.Environment.Scenes
284 { 284 {
285 isTexture = true; 285 isTexture = true;
286 } 286 }
287 AssetBase rezAsset = commsManager.AssetCache.GetAsset(item.assetID, isTexture); 287 AssetBase rezAsset = AssetCache.GetAsset(item.assetID, isTexture);
288 if (rezAsset != null) 288 if (rezAsset != null)
289 { 289 {
290 string script = Util.FieldToString(rezAsset.Data); 290 string script = Util.FieldToString(rezAsset.Data);
@@ -295,7 +295,7 @@ namespace OpenSim.Region.Environment.Scenes
295 else 295 else
296 { 296 {
297 //lets try once more incase the asset cache is being slow getting the asset from server 297 //lets try once more incase the asset cache is being slow getting the asset from server
298 rezAsset = commsManager.AssetCache.GetAsset(item.assetID, isTexture); 298 rezAsset = AssetCache.GetAsset(item.assetID, isTexture);
299 if (rezAsset != null) 299 if (rezAsset != null)
300 { 300 {
301 string script = Util.FieldToString(rezAsset.Data); 301 string script = Util.FieldToString(rezAsset.Data);
@@ -360,7 +360,7 @@ namespace OpenSim.Region.Environment.Scenes
360 if (PermissionsMngr.CanDeRezObject(remoteClient.AgentId, ((SceneObjectGroup) selectedEnt).UUID)) 360 if (PermissionsMngr.CanDeRezObject(remoteClient.AgentId, ((SceneObjectGroup) selectedEnt).UUID))
361 { 361 {
362 string sceneObjectXml = ((SceneObjectGroup) selectedEnt).ToXmlString(); 362 string sceneObjectXml = ((SceneObjectGroup) selectedEnt).ToXmlString();
363 CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); 363 CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
364 if (userInfo != null) 364 if (userInfo != null)
365 { 365 {
366 AssetBase asset = new AssetBase(); 366 AssetBase asset = new AssetBase();
@@ -371,7 +371,7 @@ namespace OpenSim.Region.Environment.Scenes
371 asset.Type = 6; 371 asset.Type = 6;
372 asset.FullID = LLUUID.Random(); 372 asset.FullID = LLUUID.Random();
373 asset.Data = Helpers.StringToField(sceneObjectXml); 373 asset.Data = Helpers.StringToField(sceneObjectXml);
374 commsManager.AssetCache.AddAsset(asset); 374 AssetCache.AddAsset(asset);
375 375
376 376
377 InventoryItemBase item = new InventoryItemBase(); 377 InventoryItemBase item = new InventoryItemBase();
@@ -407,7 +407,7 @@ namespace OpenSim.Region.Environment.Scenes
407 rootPart.PhysActor = null; 407 rootPart.PhysActor = null;
408 } 408 }
409 409
410 storageManager.DataStore.RemoveObject(group.UUID, m_regInfo.RegionID); 410 m_storageManager.DataStore.RemoveObject(group.UUID, m_regInfo.RegionID);
411 group.DeleteGroup(); 411 group.DeleteGroup();
412 412
413 lock (Entities) 413 lock (Entities)
@@ -419,7 +419,7 @@ namespace OpenSim.Region.Environment.Scenes
419 419
420 public void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos) 420 public void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos)
421 { 421 {
422 CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); 422 CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
423 if (userInfo != null) 423 if (userInfo != null)
424 { 424 {
425 if (userInfo.RootFolder != null) 425 if (userInfo.RootFolder != null)
@@ -427,7 +427,7 @@ namespace OpenSim.Region.Environment.Scenes
427 InventoryItemBase item = userInfo.RootFolder.HasItem(itemID); 427 InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
428 if (item != null) 428 if (item != null)
429 { 429 {
430 AssetBase rezAsset = commsManager.AssetCache.GetAsset(item.assetID, false); 430 AssetBase rezAsset = AssetCache.GetAsset(item.assetID, false);
431 if (rezAsset != null) 431 if (rezAsset != null)
432 { 432 {
433 AddRezObject(Util.FieldToString(rezAsset.Data), pos); 433 AddRezObject(Util.FieldToString(rezAsset.Data), pos);
@@ -437,7 +437,7 @@ namespace OpenSim.Region.Environment.Scenes
437 else 437 else
438 { 438 {
439 //lets try once more incase the asset cache is being slow getting the asset from server 439 //lets try once more incase the asset cache is being slow getting the asset from server
440 rezAsset = commsManager.AssetCache.GetAsset(item.assetID, false); 440 rezAsset = AssetCache.GetAsset(item.assetID, false);
441 if (rezAsset != null) 441 if (rezAsset != null)
442 { 442 {
443 AddRezObject(Util.FieldToString(rezAsset.Data), pos); 443 AddRezObject(Util.FieldToString(rezAsset.Data), pos);