diff options
author | UbitUmarov | 2017-05-03 15:17:16 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-03 15:19:11 +0100 |
commit | cffe2f87e665f986a0b05e48ceec3297dc1cedc7 (patch) | |
tree | 18a2895a25714dc44b22d09beea700ba0fe53e61 /OpenSim/Region/Framework | |
parent | fix merge (diff) | |
download | opensim-SC-cffe2f87e665f986a0b05e48ceec3297dc1cedc7.zip opensim-SC-cffe2f87e665f986a0b05e48ceec3297dc1cedc7.tar.gz opensim-SC-cffe2f87e665f986a0b05e48ceec3297dc1cedc7.tar.bz2 opensim-SC-cffe2f87e665f986a0b05e48ceec3297dc1cedc7.tar.xz |
viewer can't tell if a taskitem is group owned if we don't tell him;
missing taskInv serial update"
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 8c9d0bb..3ed37a2 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -207,6 +207,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
207 | item.PermsGranter = UUID.Zero; | 207 | item.PermsGranter = UUID.Zero; |
208 | item.OwnerChanged = true; | 208 | item.OwnerChanged = true; |
209 | } | 209 | } |
210 | m_inventorySerial++; | ||
210 | m_items.LockItemsForWrite(false); | 211 | m_items.LockItemsForWrite(false); |
211 | } | 212 | } |
212 | 213 | ||
@@ -222,7 +223,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
222 | m_items.LockItemsForWrite(false); | 223 | m_items.LockItemsForWrite(false); |
223 | return; | 224 | return; |
224 | } | 225 | } |
225 | 226 | m_inventorySerial++; | |
226 | // Don't let this set the HasGroupChanged flag for attachments | 227 | // Don't let this set the HasGroupChanged flag for attachments |
227 | // as this happens during rez and we don't want a new asset | 228 | // as this happens during rez and we don't want a new asset |
228 | // for each attachment each time | 229 | // for each attachment each time |
@@ -1179,6 +1180,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1179 | foreach (TaskInventoryItem item in m_items.Values) | 1180 | foreach (TaskInventoryItem item in m_items.Values) |
1180 | { | 1181 | { |
1181 | UUID ownerID = item.OwnerID; | 1182 | UUID ownerID = item.OwnerID; |
1183 | UUID groupID = item.GroupID; | ||
1182 | uint everyoneMask = item.EveryonePermissions; | 1184 | uint everyoneMask = item.EveryonePermissions; |
1183 | uint baseMask = item.BasePermissions; | 1185 | uint baseMask = item.BasePermissions; |
1184 | uint ownerMask = item.CurrentPermissions; | 1186 | uint ownerMask = item.CurrentPermissions; |
@@ -1201,7 +1203,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1201 | 1203 | ||
1202 | invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString()); | 1204 | invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString()); |
1203 | 1205 | ||
1204 | invString.AddNameValueLine("group_id", item.GroupID.ToString()); | 1206 | invString.AddNameValueLine("group_id",groupID.ToString()); |
1207 | if(groupID != UUID.Zero && ownerID == groupID) | ||
1208 | invString.AddNameValueLine("group_owned","1"); | ||
1209 | else | ||
1210 | invString.AddNameValueLine("group_owned","0"); | ||
1211 | |||
1205 | invString.AddSectionEnd(); | 1212 | invString.AddSectionEnd(); |
1206 | 1213 | ||
1207 | if (includeAssets) | 1214 | if (includeAssets) |