aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetTransactions.cs2
-rw-r--r--OpenSim/Framework/IClientAPI.cs8
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs8
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs2
5 files changed, 15 insertions, 8 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index f7e80c9..9bc24e7 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -350,7 +350,7 @@ namespace OpenSim.Framework.Communications.Cache
350 item.inventoryNextPermissions = nextPerm; 350 item.inventoryNextPermissions = nextPerm;
351 351
352 userInfo.AddItem(ourClient.AgentId, item); 352 userInfo.AddItem(ourClient.AgentId, item);
353 ourClient.SendInventoryItemUpdate(item); 353 ourClient.SendInventoryItemCreateUpdate(item);
354 } 354 }
355 } 355 }
356 356
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index ae46d8e..a3177f7 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -477,7 +477,13 @@ namespace OpenSim.Framework
477 477
478 void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items, int subFoldersCount); 478 void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items, int subFoldersCount);
479 void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item); 479 void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item);
480 void SendInventoryItemUpdate(InventoryItemBase Item); 480
481 /// <summary>
482 /// Tell the client that we have created the item it requested.
483 /// </summary>
484 /// <param name="Item"></param>
485 void SendInventoryItemCreateUpdate(InventoryItemBase Item);
486
481 void SendRemoveInventoryItem(LLUUID itemID); 487 void SendRemoveInventoryItem(LLUUID itemID);
482 void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName); 488 void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName);
483 void SendXferPacket(ulong xferID, uint packet, byte[] data); 489 void SendXferPacket(ulong xferID, uint packet, byte[] data);
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index e3a40ea..f04a70a 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -1176,7 +1176,8 @@ namespace OpenSim.Region.ClientStack
1176 OutPacket(inventoryReply, ThrottleOutPacketType.Asset); 1176 OutPacket(inventoryReply, ThrottleOutPacketType.Asset);
1177 } 1177 }
1178 1178
1179 public void SendInventoryItemUpdate(InventoryItemBase Item) 1179 /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see>
1180 public void SendInventoryItemCreateUpdate(InventoryItemBase Item)
1180 { 1181 {
1181 Encoding enc = Encoding.ASCII; 1182 Encoding enc = Encoding.ASCII;
1182 uint FULL_MASK_PERMISSIONS = 2147483647; 1183 uint FULL_MASK_PERMISSIONS = 2147483647;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 6370bcb..1ea8d5a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Environment.Scenes
57 if (userInfo != null) 57 if (userInfo != null)
58 { 58 {
59 userInfo.AddItem(remoteClient.AgentId, item); 59 userInfo.AddItem(remoteClient.AgentId, item);
60 remoteClient.SendInventoryItemUpdate(item); 60 remoteClient.SendInventoryItemCreateUpdate(item);
61 } 61 }
62 } 62 }
63 63
@@ -89,7 +89,7 @@ namespace OpenSim.Region.Environment.Scenes
89 item.assetID = asset.FullID; 89 item.assetID = asset.FullID;
90 userInfo.UpdateItem(remoteClient.AgentId, item); 90 userInfo.UpdateItem(remoteClient.AgentId, item);
91 91
92 // remoteClient.SendInventoryItemUpdate(item); 92 // remoteClient.SendInventoryItemCreateUpdate(item);
93 if ((InventoryType) item.invType == InventoryType.Notecard) 93 if ((InventoryType) item.invType == InventoryType.Notecard)
94 { 94 {
95 //do we want to know about updated note cards? 95 //do we want to know about updated note cards?
@@ -229,7 +229,7 @@ namespace OpenSim.Region.Environment.Scenes
229 item.inventoryNextPermissions = nextOwnerMask; 229 item.inventoryNextPermissions = nextOwnerMask;
230 230
231 userInfo.AddItem(remoteClient.AgentId, item); 231 userInfo.AddItem(remoteClient.AgentId, item);
232 remoteClient.SendInventoryItemUpdate(item); 232 remoteClient.SendInventoryItemCreateUpdate(item);
233 } 233 }
234 } 234 }
235 235
@@ -423,7 +423,7 @@ namespace OpenSim.Region.Environment.Scenes
423 item.inventoryNextPermissions = 2147483647; 423 item.inventoryNextPermissions = 2147483647;
424 424
425 userInfo.AddItem(remoteClient.AgentId, item); 425 userInfo.AddItem(remoteClient.AgentId, item);
426 remoteClient.SendInventoryItemUpdate(item); 426 remoteClient.SendInventoryItemCreateUpdate(item);
427 } 427 }
428 428
429 DeleteSceneObjectGroup((SceneObjectGroup) selectedEnt); 429 DeleteSceneObjectGroup((SceneObjectGroup) selectedEnt);
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
index 14c4380..6887deb 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
@@ -310,7 +310,7 @@ namespace SimpleApp
310 { 310 {
311 } 311 }
312 312
313 public virtual void SendInventoryItemUpdate(InventoryItemBase Item) 313 public virtual void SendInventoryItemCreateUpdate(InventoryItemBase Item)
314 { 314 {
315 } 315 }
316 316