diff options
author | Dan Lake | 2011-11-10 15:20:21 -0800 |
---|---|---|
committer | Dan Lake | 2011-11-10 15:20:21 -0800 |
commit | 9359293b11dfd0db82ba3ce8110b0014afbde88f (patch) | |
tree | 5ec72bb8306bf6eebbf0fd192de73619e2e9e68b /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
download | opensim-SC-9359293b11dfd0db82ba3ce8110b0014afbde88f.zip opensim-SC-9359293b11dfd0db82ba3ce8110b0014afbde88f.tar.gz opensim-SC-9359293b11dfd0db82ba3ce8110b0014afbde88f.tar.bz2 opensim-SC-9359293b11dfd0db82ba3ce8110b0014afbde88f.tar.xz |
Cleaned UpdatePermissions calls on SOP and SOG to eliminate redundant properties packet sends and so one part is not telling a different part what to do. That should be up to the SOG to manage permissions on its parts and notify clients when one of them changes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 3fa6bb0..4355394 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1873,7 +1873,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1873 | } | 1873 | } |
1874 | 1874 | ||
1875 | /// <summary> | 1875 | /// <summary> |
1876 | /// Send metadata about the root prim (name, description, sale price, etc.) to a client. | 1876 | /// Send metadata about the root prim (name, description, sale price, permissions, etc.) to a client. |
1877 | /// </summary> | 1877 | /// </summary> |
1878 | /// <param name="client"></param> | 1878 | /// <param name="client"></param> |
1879 | public void SendPropertiesToClient(IClientAPI client) | 1879 | public void SendPropertiesToClient(IClientAPI client) |
@@ -2481,6 +2481,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
2481 | parts[i].UpdatePermissions(AgentID, field, localID, mask, addRemTF); | 2481 | parts[i].UpdatePermissions(AgentID, field, localID, mask, addRemTF); |
2482 | 2482 | ||
2483 | HasGroupChanged = true; | 2483 | HasGroupChanged = true; |
2484 | |||
2485 | // Send the group's properties to all clients once all parts are updated | ||
2486 | IClientAPI client; | ||
2487 | if (Scene.TryGetClient(AgentID, out client)) | ||
2488 | SendPropertiesToClient(client); | ||
2484 | } | 2489 | } |
2485 | 2490 | ||
2486 | #endregion | 2491 | #endregion |