diff options
author | UbitUmarov | 2016-08-16 05:04:44 +0100 |
---|---|---|
committer | UbitUmarov | 2016-08-16 05:05:53 +0100 |
commit | 1c1d40cf6a0d40f510607b834416dc10ec318db4 (patch) | |
tree | a59b53de900349db2c9d73715aab910cc95fa482 /OpenSim | |
parent | sync osForceAttachToOtherAvatarFromInventory thread level in code and in oss... (diff) | |
download | opensim-SC-1c1d40cf6a0d40f510607b834416dc10ec318db4.zip opensim-SC-1c1d40cf6a0d40f510607b834416dc10ec318db4.tar.gz opensim-SC-1c1d40cf6a0d40f510607b834416dc10ec318db4.tar.bz2 opensim-SC-1c1d40cf6a0d40f510607b834416dc10ec318db4.tar.xz |
libOMV PrimFlags.JointLP2P does not exist. Its bit now means
VolumeDetector. VolumeDetectActive is now stored on that flag bit. with
this change it is now sent to viewers that now gray out phantom on object
edit. At same time fixes the fact volumedetector was not been saved on
region db and so was lost on restarts. libOMV needs to be fix on this and other PrimFlags
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 6f2a1de..459b01e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -285,7 +285,23 @@ namespace OpenSim.Region.Framework.Scenes | |||
285 | // but reversed logic: bit cleared means free to rotate | 285 | // but reversed logic: bit cleared means free to rotate |
286 | public byte RotationAxisLocks = 0; | 286 | public byte RotationAxisLocks = 0; |
287 | 287 | ||
288 | public bool VolumeDetectActive; | 288 | // WRONG flag in libOmvPrimFlags |
289 | private const uint primFlagVolumeDetect = (uint)PrimFlags.JointLP2P; | ||
290 | |||
291 | public bool VolumeDetectActive | ||
292 | { | ||
293 | get | ||
294 | { | ||
295 | return (Flags & (PrimFlags)primFlagVolumeDetect) != 0; | ||
296 | } | ||
297 | set | ||
298 | { | ||
299 | if(value) | ||
300 | Flags |= (PrimFlags)primFlagVolumeDetect; | ||
301 | else | ||
302 | Flags &= (PrimFlags)(~primFlagVolumeDetect); | ||
303 | } | ||
304 | } | ||
289 | 305 | ||
290 | public bool IsWaitingForFirstSpinUpdatePacket; | 306 | public bool IsWaitingForFirstSpinUpdatePacket; |
291 | 307 | ||
@@ -4742,7 +4758,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter | |||
4742 | VolumeDetectActive = SetVD; | 4758 | VolumeDetectActive = SetVD; |
4743 | 4759 | ||
4744 | // volume detector implies phantom we need to decouple this mess | 4760 | // volume detector implies phantom we need to decouple this mess |
4745 | if (VolumeDetectActive) | 4761 | if (SetVD) |
4746 | SetPhantom = true; | 4762 | SetPhantom = true; |
4747 | else if(wasVD) | 4763 | else if(wasVD) |
4748 | SetPhantom = false; | 4764 | SetPhantom = false; |