aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-02-27 18:55:17 +0100
committerMelanie2011-02-27 18:55:17 +0100
commit11105d38bdd8eb3eb3eb29eac7f054a2bdc22baf (patch)
tree889dee78eb80c247af760d8c37d810f3c64b7874 /OpenSim
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-11105d38bdd8eb3eb3eb29eac7f054a2bdc22baf.zip
opensim-SC-11105d38bdd8eb3eb3eb29eac7f054a2bdc22baf.tar.gz
opensim-SC-11105d38bdd8eb3eb3eb29eac7f054a2bdc22baf.tar.bz2
opensim-SC-11105d38bdd8eb3eb3eb29eac7f054a2bdc22baf.tar.xz
Fix a few little things
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs2
2 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index fcf571d..108c9a0 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -149,6 +149,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
149 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); 149 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
150 item = m_Scene.InventoryService.GetItem(item); 150 item = m_Scene.InventoryService.GetItem(item);
151 151
152 if (item.Owner != remoteClient.AgentId)
153 return UUID.Zero;
154
152 if (item != null) 155 if (item != null)
153 { 156 {
154 if ((InventoryType)item.InvType == InventoryType.Notecard) 157 if ((InventoryType)item.InvType == InventoryType.Notecard)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 9150257..bc892e0 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -303,6 +303,8 @@ namespace OpenSim.Region.Framework.Scenes
303 // Passing something to another avatar or a an object will already 303 // Passing something to another avatar or a an object will already
304 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); 304 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
305 item = InventoryService.GetItem(item); 305 item = InventoryService.GetItem(item);
306 if (item.Owner != remoteClient.AgentId)
307 return;
306 308
307 if (item != null) 309 if (item != null)
308 { 310 {