ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster

Browse Source
This commit is contained in:
Melanie
2012-04-20 00:17:14 +01:00
parent c2be894330 aeb5aed5b7
commit 65b3e13010
9 changed files with 170 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@@ -1519,8 +1519,18 @@ namespace OpenSim.Region.Framework.Scenes
if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId))
{
// VolumeDetect can't be set via UI and will always be off when a change is made there
if (PhysData.PhysShapeType == PhysShapeType.invalid)
group.UpdatePrimFlags(localID, UsePhysics, SetTemporary, SetPhantom, false);
// now only change volume dtc if phantom off
if (PhysData.PhysShapeType == PhysShapeType.invalid) // check for extraPhysics data
{
bool vdtc;
if (SetPhantom) // if phantom keep volumedtc
vdtc = group.RootPart.VolumeDetectActive;
else // else turn it off
vdtc = false;
group.UpdatePrimFlags(localID, UsePhysics, SetTemporary, SetPhantom, vdtc);
}
else
{
SceneObjectPart part = GetSceneObjectPart(localID);