diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index a078291..7ec7ea3 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1401,21 +1401,26 @@ namespace OpenSim.Region.Framework.Scenes | |||
1401 | } | 1401 | } |
1402 | 1402 | ||
1403 | /// <summary> | 1403 | /// <summary> |
1404 | /// | 1404 | /// Update the flags on a scene object. This covers properties such as phantom, physics and temporary. |
1405 | /// </summary> | 1405 | /// </summary> |
1406 | /// <remarks> | ||
1407 | /// This is currently handling the incoming call from the client stack (e.g. LLClientView). | ||
1408 | /// </remarks> | ||
1406 | /// <param name="localID"></param> | 1409 | /// <param name="localID"></param> |
1407 | /// <param name="packet"></param> | 1410 | /// <param name="UsePhysics"></param> |
1411 | /// <param name="SetTemporary"></param> | ||
1412 | /// <param name="SetPhantom"></param> | ||
1408 | /// <param name="remoteClient"></param> | 1413 | /// <param name="remoteClient"></param> |
1409 | /// This routine seems to get called when a user changes object settings in the viewer. | 1414 | protected internal void UpdatePrimFlags( |
1410 | /// If some one can confirm that, please change the comment according. | 1415 | uint localID, bool UsePhysics, bool SetTemporary, bool SetPhantom, IClientAPI remoteClient) |
1411 | protected internal void UpdatePrimFlags(uint localID, bool UsePhysics, bool IsTemporary, bool IsPhantom, IClientAPI remoteClient) | ||
1412 | { | 1416 | { |
1413 | SceneObjectGroup group = GetGroupByPrim(localID); | 1417 | SceneObjectGroup group = GetGroupByPrim(localID); |
1414 | if (group != null) | 1418 | if (group != null) |
1415 | { | 1419 | { |
1416 | if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId)) | 1420 | if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId)) |
1417 | { | 1421 | { |
1418 | group.UpdatePrimFlags(localID, UsePhysics, IsTemporary, IsPhantom, false); // VolumeDetect can't be set via UI and will always be off when a change is made there | 1422 | // VolumeDetect can't be set via UI and will always be off when a change is made there |
1423 | group.UpdatePrimFlags(localID, UsePhysics, SetTemporary, SetPhantom, false); | ||
1419 | } | 1424 | } |
1420 | } | 1425 | } |
1421 | } | 1426 | } |