aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSnoopy Pfeffer2011-08-22 14:51:43 +0200
committerSnoopy Pfeffer2011-08-22 14:51:43 +0200
commitdb91044593fc2592c7abb21034aeea8965febbd7 (patch)
treed0cf5b6a01d4fa323abc8d0ae60c4c298db89432
parentread m_rpcHandlersKeepAlive under appropriate lock (diff)
downloadopensim-SC_OLD-db91044593fc2592c7abb21034aeea8965febbd7.zip
opensim-SC_OLD-db91044593fc2592c7abb21034aeea8965febbd7.tar.gz
opensim-SC_OLD-db91044593fc2592c7abb21034aeea8965febbd7.tar.bz2
opensim-SC_OLD-db91044593fc2592c7abb21034aeea8965febbd7.tar.xz
Thanks Neil Canham for fixing bulk inventory updates, no sending BulkInventoryUpdate after accepting inventory items.
Diffstat (limited to '')
-rw-r--r--CONTRIBUTORS.txt1
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs13
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
3 files changed, 14 insertions, 2 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index b73a87d..2fe8b46 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -113,6 +113,7 @@ what it is today.
113* mpallari 113* mpallari
114* MrMonkE 114* MrMonkE
115* Nebadon Izumi (Michael Cerquoni - http://OSgrid.org) 115* Nebadon Izumi (Michael Cerquoni - http://OSgrid.org)
116* Neil Canham
116* nornalbion 117* nornalbion
117* Omar Vera Ustariz (IBM) 118* Omar Vera Ustariz (IBM)
118* openlifegrid.com 119* openlifegrid.com
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index e3d4969..b4f69e6 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -278,7 +278,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
278 else 278 else
279 { 279 {
280 if (m_TransferModule != null) 280 if (m_TransferModule != null)
281 m_TransferModule.SendInstantMessage(im, delegate(bool success) {}); 281 m_TransferModule.SendInstantMessage(im, delegate(bool success) {
282 // Send BulkUpdateInventory
283 IInventoryService invService = scene.InventoryService;
284 UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item /folder, back from it's trip
285
286 InventoryFolderBase folder = new InventoryFolderBase(inventoryEntityID, client.AgentId);
287 folder = invService.GetFolder(folder);
288
289 ScenePresence fromUser = scene.GetScenePresence(new UUID(im.fromAgentID));
290
291 fromUser.ControllingClient.SendBulkUpdateInventory(folder);
292 });
282 } 293 }
283 } 294 }
284 else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined) 295 else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index db45354..ef67a0c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3927,7 +3927,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3927 GridInstantMessage msg = new GridInstantMessage(World, 3927 GridInstantMessage msg = new GridInstantMessage(World,
3928 m_host.UUID, m_host.Name+", an object owned by "+ 3928 m_host.UUID, m_host.Name+", an object owned by "+
3929 resolveName(m_host.OwnerID)+",", destId, 3929 resolveName(m_host.OwnerID)+",", destId,
3930 (byte)InstantMessageDialog.InventoryOffered, 3930 (byte)InstantMessageDialog.TaskInventoryOffered,
3931 false, objName+"\n"+m_host.Name+" is located at "+ 3931 false, objName+"\n"+m_host.Name+" is located at "+
3932 World.RegionInfo.RegionName+" "+ 3932 World.RegionInfo.RegionName+" "+
3933 m_host.AbsolutePosition.ToString(), 3933 m_host.AbsolutePosition.ToString(),