aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2009-02-19 03:09:56 +0000
committerMelanie Thielker2009-02-19 03:09:56 +0000
commit863556f2cc545c56599aab9d28373aa4ed83288d (patch)
tree37ede97ac7497333690dfa23e9a1033bfaab59a6 /OpenSim
parentMantis#3188. Thank you kindly, BlueWall, for a patch that: (diff)
downloadopensim-SC-863556f2cc545c56599aab9d28373aa4ed83288d.zip
opensim-SC-863556f2cc545c56599aab9d28373aa4ed83288d.tar.gz
opensim-SC-863556f2cc545c56599aab9d28373aa4ed83288d.tar.bz2
opensim-SC-863556f2cc545c56599aab9d28373aa4ed83288d.tar.xz
Thank you, Snowdrop, for a patch that makes the callback ID parameter
usable. Applied with formatting changes, please don't introduce K&R style indentations into OpenSim Fixes Mantis #3190
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs3
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs8
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs13
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs2
8 files changed, 18 insertions, 16 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 673810e..bfc70a4 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -878,7 +878,7 @@ namespace OpenSim.Framework
878 /// Tell the client that we have created the item it requested. 878 /// Tell the client that we have created the item it requested.
879 /// </summary> 879 /// </summary>
880 /// <param name="Item"></param> 880 /// <param name="Item"></param>
881 void SendInventoryItemCreateUpdate(InventoryItemBase Item); 881 void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId);
882 882
883 void SendRemoveInventoryItem(UUID itemID); 883 void SendRemoveInventoryItem(UUID itemID);
884 884
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 3565e5a..34ad0f1 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2062,7 +2062,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2062 } 2062 }
2063 2063
2064 /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see> 2064 /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see>
2065 public void SendInventoryItemCreateUpdate(InventoryItemBase Item) 2065 public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId)
2066 { 2066 {
2067 const uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All; 2067 const uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All;
2068 2068
@@ -2088,6 +2088,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2088 InventoryReply.InventoryData[0].OwnerID = Item.Owner; 2088 InventoryReply.InventoryData[0].OwnerID = Item.Owner;
2089 InventoryReply.InventoryData[0].OwnerMask = Item.CurrentPermissions; 2089 InventoryReply.InventoryData[0].OwnerMask = Item.CurrentPermissions;
2090 InventoryReply.InventoryData[0].Type = (sbyte)Item.AssetType; 2090 InventoryReply.InventoryData[0].Type = (sbyte)Item.AssetType;
2091 InventoryReply.InventoryData[0].CallbackID = callbackId;
2091 2092
2092 InventoryReply.InventoryData[0].GroupID = Item.GroupID; 2093 InventoryReply.InventoryData[0].GroupID = Item.GroupID;
2093 InventoryReply.InventoryData[0].GroupOwned = Item.GroupOwned; 2094 InventoryReply.InventoryData[0].GroupOwned = Item.GroupOwned;
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index b71c2a6..7803209 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -148,7 +148,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
148 m_finished = true; 148 m_finished = true;
149 if (m_createItem) 149 if (m_createItem)
150 { 150 {
151 DoCreateItem(); 151 DoCreateItem(0);
152 } 152 }
153 else if (m_storeLocal) 153 else if (m_storeLocal)
154 { 154 {
@@ -200,7 +200,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
200 200
201 if (m_finished) 201 if (m_finished)
202 { 202 {
203 DoCreateItem(); 203 DoCreateItem(callbackID);
204 } 204 }
205 else 205 else
206 { 206 {
@@ -210,7 +210,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
210 } 210 }
211 211
212 212
213 private void DoCreateItem() 213 private void DoCreateItem(uint callbackID)
214 { 214 {
215 m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(m_asset); 215 m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(m_asset);
216 CachedUserInfo userInfo = 216 CachedUserInfo userInfo =
@@ -238,7 +238,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
238 item.CreationDate = Util.UnixTimeSinceEpoch(); 238 item.CreationDate = Util.UnixTimeSinceEpoch();
239 239
240 userInfo.AddItem(item); 240 userInfo.AddItem(item);
241 ourClient.SendInventoryItemCreateUpdate(item); 241 ourClient.SendInventoryItemCreateUpdate(item, callbackID);
242 } 242 }
243 else 243 else
244 { 244 {
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 4e11759..3d461e7 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -540,7 +540,7 @@ namespace OpenSim.Region.Examples.SimpleModule
540 { 540 {
541 } 541 }
542 542
543 public virtual void SendInventoryItemCreateUpdate(InventoryItemBase Item) 543 public virtual void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackID)
544 { 544 {
545 } 545 }
546 546
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;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 1d2f37a..23c4478 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3581,7 +3581,7 @@ namespace OpenSim.Region.Framework.Scenes
3581 item.CreationDate = Util.UnixTimeSinceEpoch(); 3581 item.CreationDate = Util.UnixTimeSinceEpoch();
3582 3582
3583 userInfo.AddItem(item); 3583 userInfo.AddItem(item);
3584 remoteClient.SendInventoryItemCreateUpdate(item); 3584 remoteClient.SendInventoryItemCreateUpdate(item, 0);
3585 } 3585 }
3586 else 3586 else
3587 { 3587 {
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index c84ede8..871a581 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -628,7 +628,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
628 { 628 {
629 } 629 }
630 630
631 public virtual void SendInventoryItemCreateUpdate(InventoryItemBase Item) 631 public virtual void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackID)
632 { 632 {
633 } 633 }
634 634
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 373ee13..ee4aaa8 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -619,7 +619,7 @@ namespace OpenSim.Tests.Common.Mock
619 { 619 {
620 } 620 }
621 621
622 public virtual void SendInventoryItemCreateUpdate(InventoryItemBase Item) 622 public virtual void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackID)
623 { 623 {
624 } 624 }
625 625