aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorKitto Flora2009-09-30 19:01:55 +0200
committerKitto Flora2009-09-30 19:01:55 +0200
commit6b65eb76d0a664a582f10ac105733d3cdc2b4897 (patch)
tree42f9b019d105793ce28ee3967fda5c3f1d4635f3 /OpenSim/Region/Framework
parentSmall chaneg to adapt to trunk (diff)
downloadopensim-SC_OLD-6b65eb76d0a664a582f10ac105733d3cdc2b4897.zip
opensim-SC_OLD-6b65eb76d0a664a582f10ac105733d3cdc2b4897.tar.gz
opensim-SC_OLD-6b65eb76d0a664a582f10ac105733d3cdc2b4897.tar.bz2
opensim-SC_OLD-6b65eb76d0a664a582f10ac105733d3cdc2b4897.tar.xz
Another small change to avoid later merge conflict
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index b284ed4..203faed 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3410,7 +3410,8 @@ if (m_shape != null) {
3410 { 3410 {
3411 RemFlag(PrimFlags.Phantom); 3411 RemFlag(PrimFlags.Phantom);
3412 3412
3413 if (PhysActor == null) 3413 PhysicsActor pa = PhysActor;
3414 if (pa == null)
3414 { 3415 {
3415 // It's not phantom anymore. So make sure the physics engine get's knowledge of it 3416 // It's not phantom anymore. So make sure the physics engine get's knowledge of it
3416 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( 3417 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
@@ -3421,7 +3422,7 @@ if (m_shape != null) {
3421 RotationOffset, 3422 RotationOffset,
3422 UsePhysics); 3423 UsePhysics);
3423 3424
3424 PhysicsActor pa = PhysActor; 3425 pa = PhysActor;
3425 if (pa != null) 3426 if (pa != null)
3426 { 3427 {
3427 pa.LocalID = LocalId; 3428 pa.LocalID = LocalId;