From 32c43bf59a3b9c3cb0b9eb1d52f664997e39a50d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 5 Apr 2010 19:37:02 +0100
Subject: Partially implement share with group option for object inventory
 items If serverside permissions are off then this works as expected. 
 Previously, it was impossible for more than one person to edit such items
 even if permissions were off. If serverside permissions are on then this
 works as expected if the object was created by an avatar who had the required
 group active. However, if the group for the object is later set then the
 contained item is still not editable.  This may be linked to a wider bug
 where the object is still not modifiable by the group anyway

Resolve conflict in LLClientView
---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 71354b4..4034744 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -173,7 +173,9 @@ namespace OpenSim.Region.Framework.Scenes
                             item.NextPermissions;
                     taskItem.NextPermissions = item.NextPermissions;
                     taskItem.CurrentPermissions |= 8;
-                } else {
+                } 
+                else 
+                {
                     taskItem.BasePermissions = item.BasePermissions;
                     taskItem.CurrentPermissions = item.CurrentPermissions;
                     taskItem.CurrentPermissions |= 8;
-- 
cgit v1.1