aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2017-05-03 19:10:02 +0100
committerUbitUmarov2017-05-03 19:10:02 +0100
commitfc462747329379c923bcc38cd11c43823b7e3cf1 (patch)
treee9f07c29e512ae6a7c0f5fb4ef3115c69ca143bb
parent taskitem group owned information was still incorrect (diff)
downloadopensim-SC-fc462747329379c923bcc38cd11c43823b7e3cf1.zip
opensim-SC-fc462747329379c923bcc38cd11c43823b7e3cf1.tar.gz
opensim-SC-fc462747329379c923bcc38cd11c43823b7e3cf1.tar.bz2
opensim-SC-fc462747329379c923bcc38cd11c43823b7e3cf1.tar.xz
still another missing conversion btw viewer and OS on groupd owned
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 1db6880..4df1f27 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -236,10 +236,7 @@ namespace OpenSim.Region.Framework.Scenes
236 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); 236 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
237 foreach (TaskInventoryItem item in items) 237 foreach (TaskInventoryItem item in items)
238 { 238 {
239 if (groupID != item.GroupID) 239 item.GroupID = groupID;
240 {
241 item.GroupID = groupID;
242 }
243 } 240 }
244 m_items.LockItemsForWrite(false); 241 m_items.LockItemsForWrite(false);
245 } 242 }
@@ -1020,6 +1017,9 @@ namespace OpenSim.Region.Framework.Scenes
1020 if (item.GroupPermissions != (uint)PermissionMask.None) 1017 if (item.GroupPermissions != (uint)PermissionMask.None)
1021 item.GroupID = m_part.GroupID; 1018 item.GroupID = m_part.GroupID;
1022 1019
1020 if(item.OwnerID == UUID.Zero) // viewer to internal enconding of group owned
1021 item.OwnerID = item.GroupID;
1022
1023 if (item.AssetID == UUID.Zero) 1023 if (item.AssetID == UUID.Zero)
1024 item.AssetID = m_items[item.ItemID].AssetID; 1024 item.AssetID = m_items[item.ItemID].AssetID;
1025 1025