aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
authorCharles Krinke2008-12-20 21:36:42 +0000
committerCharles Krinke2008-12-20 21:36:42 +0000
commit62dd67b8b8a7eb441d57f2b854444fbc5c4767d3 (patch)
treeb6c9f1123ae69ed2c6d67a4e939168b9140acb55 /OpenSim/Region/Environment/Scenes/SceneGraph.cs
parentMantis#2881. Thank you kindly, SirKimba for a patch that: (diff)
downloadopensim-SC_OLD-62dd67b8b8a7eb441d57f2b854444fbc5c4767d3.zip
opensim-SC_OLD-62dd67b8b8a7eb441d57f2b854444fbc5c4767d3.tar.gz
opensim-SC_OLD-62dd67b8b8a7eb441d57f2b854444fbc5c4767d3.tar.bz2
opensim-SC_OLD-62dd67b8b8a7eb441d57f2b854444fbc5c4767d3.tar.xz
Mantis#2796. Thank you kindly, Gerhard for a patch that addresses:
On a call of llVolumeDetect(1) (or any other number !=0) volume detection is enabled. Together with VD, the phantom flag is set to the GUI. On a call of llVolumeDetect(0), vd detection is switched of again, also the phantom state is removed. On a call to llSetState(STATE_PHANTOM, false) while VD is active, also VD is switched off. The same is true for unchecking the phantom flag via GUI. This allows to take back VD without the need to script just by removing the phantom flag. Things missing in this patch: persistance of the volume-detection flag. This needs more discussion and will be included in another patch soon.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneGraph.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Environment/Scenes/SceneGraph.cs
index b373c09..d261e2d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneGraph.cs
@@ -1203,6 +1203,8 @@ namespace OpenSim.Region.Environment.Scenes
1203 /// <param name="localID"></param> 1203 /// <param name="localID"></param>
1204 /// <param name="packet"></param> 1204 /// <param name="packet"></param>
1205 /// <param name="remoteClient"></param> 1205 /// <param name="remoteClient"></param>
1206 /// This routine seems to get called when a user changes object settings in the viewer.
1207 /// If some one can confirm that, please change the comment according.
1206 protected internal void UpdatePrimFlags(uint localID, bool UsePhysics, bool IsTemporary, bool IsPhantom, IClientAPI remoteClient) 1208 protected internal void UpdatePrimFlags(uint localID, bool UsePhysics, bool IsTemporary, bool IsPhantom, IClientAPI remoteClient)
1207 { 1209 {
1208 SceneObjectGroup group = GetGroupByPrim(localID); 1210 SceneObjectGroup group = GetGroupByPrim(localID);
@@ -1210,7 +1212,7 @@ namespace OpenSim.Region.Environment.Scenes
1210 { 1212 {
1211 if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId)) 1213 if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId))
1212 { 1214 {
1213 group.UpdatePrimFlags(localID, UsePhysics, IsTemporary, IsPhantom); 1215 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
1214 } 1216 }
1215 } 1217 }
1216 } 1218 }