OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

viewer can't tell if a taskitem is group owned if we don't tell him; 

missing taskInv serial update"
httptests
UbitUmarov 2017-05-03 15:17:16 +01:00
parent 832ca518d7
commit cffe2f87e6
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@ -207,6 +207,7 @@ namespace OpenSim.Region.Framework.Scenes
item.PermsGranter = UUID.Zero; item.PermsGranter = UUID.Zero;
item.OwnerChanged = true; item.OwnerChanged = true;
} }
m_inventorySerial++;
m_items.LockItemsForWrite(false); m_items.LockItemsForWrite(false);
} }
@ -222,7 +223,7 @@ namespace OpenSim.Region.Framework.Scenes
m_items.LockItemsForWrite(false); m_items.LockItemsForWrite(false);
return; return;
} }
m_inventorySerial++;
// Don't let this set the HasGroupChanged flag for attachments // Don't let this set the HasGroupChanged flag for attachments
// as this happens during rez and we don't want a new asset // as this happens during rez and we don't want a new asset
// for each attachment each time // for each attachment each time
@ -1179,6 +1180,7 @@ namespace OpenSim.Region.Framework.Scenes
foreach (TaskInventoryItem item in m_items.Values) foreach (TaskInventoryItem item in m_items.Values)
{ {
UUID ownerID = item.OwnerID; UUID ownerID = item.OwnerID;
UUID groupID = item.GroupID;
uint everyoneMask = item.EveryonePermissions; uint everyoneMask = item.EveryonePermissions;
uint baseMask = item.BasePermissions; uint baseMask = item.BasePermissions;
uint ownerMask = item.CurrentPermissions; uint ownerMask = item.CurrentPermissions;
@ -1201,7 +1203,12 @@ namespace OpenSim.Region.Framework.Scenes
invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString()); invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString());
invString.AddNameValueLine("group_id", item.GroupID.ToString()); invString.AddNameValueLine("group_id",groupID.ToString());
if(groupID != UUID.Zero && ownerID == groupID)
invString.AddNameValueLine("group_owned","1");
else
invString.AddNameValueLine("group_owned","0");
invString.AddSectionEnd(); invString.AddSectionEnd();
if (includeAssets) if (includeAssets)