aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-09-27 00:29:27 +0100
committerMelanie2010-09-27 00:29:27 +0100
commit34e8bf45b6f44c7e9c1e8fb824215214f6e9244c (patch)
tree2e844ccd09ac35fc79dc56f7e92db0e2ee9a03e1
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-34e8bf45b6f44c7e9c1e8fb824215214f6e9244c.zip
opensim-SC-34e8bf45b6f44c7e9c1e8fb824215214f6e9244c.tar.gz
opensim-SC-34e8bf45b6f44c7e9c1e8fb824215214f6e9244c.tar.bz2
opensim-SC-34e8bf45b6f44c7e9c1e8fb824215214f6e9244c.tar.xz
Restrict inventory items added in a transaction to folder belonging
to the connected client.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 18cfcbc..9a33993 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -834,6 +834,12 @@ namespace OpenSim.Region.Framework.Scenes
834 if (!Permissions.CanCreateUserInventory(invType, remoteClient.AgentId)) 834 if (!Permissions.CanCreateUserInventory(invType, remoteClient.AgentId))
835 return; 835 return;
836 836
837 InventoryFolderBase f = new InventoryFolderBase(folderID, remoteClient.AgentId);
838 InventoryFolderBase folder = InventoryService.GetFolder(f);
839
840 if (folder == null || folder.Owner != remoteClient.AgentId)
841 return;
842
837 if (transactionID == UUID.Zero) 843 if (transactionID == UUID.Zero)
838 { 844 {
839 ScenePresence presence; 845 ScenePresence presence;