diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 2800e9e..f5d7b32 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
140 | if (userInfo != null) | 140 | if (userInfo != null) |
141 | { | 141 | { |
142 | AddInventoryItem(remoteClient.AgentId, item); | 142 | AddInventoryItem(remoteClient.AgentId, item); |
143 | remoteClient.SendInventoryItemCreateUpdate(item); | 143 | remoteClient.SendInventoryItemCreateUpdate(item, 0); |
144 | } | 144 | } |
145 | else | 145 | else |
146 | { | 146 | { |
@@ -846,7 +846,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
846 | item.CreationDate = creationDate; | 846 | item.CreationDate = creationDate; |
847 | 847 | ||
848 | userInfo.AddItem(item); | 848 | userInfo.AddItem(item); |
849 | remoteClient.SendInventoryItemCreateUpdate(item); | 849 | remoteClient.SendInventoryItemCreateUpdate(item, callbackID); |
850 | } | 850 | } |
851 | else | 851 | else |
852 | { | 852 | { |
@@ -1379,6 +1379,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1379 | 1379 | ||
1380 | if (part != null) | 1380 | if (part != null) |
1381 | { | 1381 | { |
1382 | |||
1382 | TaskInventoryItem currentItem = part.Inventory.GetInventoryItem(itemID); | 1383 | TaskInventoryItem currentItem = part.Inventory.GetInventoryItem(itemID); |
1383 | bool allowInventoryDrop = (part.GetEffectiveObjectFlags() | 1384 | bool allowInventoryDrop = (part.GetEffectiveObjectFlags() |
1384 | & (uint)PrimFlags.AllowInventoryDrop) != 0; | 1385 | & (uint)PrimFlags.AllowInventoryDrop) != 0; |
@@ -2003,14 +2004,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
2003 | 2004 | ||
2004 | if (remoteClient != null && item.Owner == remoteClient.AgentId) | 2005 | if (remoteClient != null && item.Owner == remoteClient.AgentId) |
2005 | { | 2006 | { |
2006 | remoteClient.SendInventoryItemCreateUpdate(item); | 2007 | remoteClient.SendInventoryItemCreateUpdate(item, 0); |
2007 | } | 2008 | } |
2008 | else | 2009 | else |
2009 | { | 2010 | { |
2010 | ScenePresence notifyUser = GetScenePresence(item.Owner); | 2011 | ScenePresence notifyUser = GetScenePresence(item.Owner); |
2011 | if (notifyUser != null) | 2012 | if (notifyUser != null) |
2012 | { | 2013 | { |
2013 | notifyUser.ControllingClient.SendInventoryItemCreateUpdate(item); | 2014 | notifyUser.ControllingClient.SendInventoryItemCreateUpdate(item, 0); |
2014 | } | 2015 | } |
2015 | } | 2016 | } |
2016 | } | 2017 | } |
@@ -2092,7 +2093,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2092 | // this gets called when the agent loggs off! | 2093 | // this gets called when the agent loggs off! |
2093 | if (remoteClient != null) | 2094 | if (remoteClient != null) |
2094 | { | 2095 | { |
2095 | remoteClient.SendInventoryItemCreateUpdate(item); | 2096 | remoteClient.SendInventoryItemCreateUpdate(item, 0); |
2096 | } | 2097 | } |
2097 | } | 2098 | } |
2098 | } | 2099 | } |
@@ -2151,7 +2152,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2151 | grp.SetFromAssetID(item.ID); | 2152 | grp.SetFromAssetID(item.ID); |
2152 | 2153 | ||
2153 | userInfo.AddItem(item); | 2154 | userInfo.AddItem(item); |
2154 | remoteClient.SendInventoryItemCreateUpdate(item); | 2155 | remoteClient.SendInventoryItemCreateUpdate(item, 0); |
2155 | 2156 | ||
2156 | itemID = item.ID; | 2157 | itemID = item.ID; |
2157 | return item.AssetID; | 2158 | return item.AssetID; |