aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie2011-07-15 19:35:49 +0200
committerMelanie2011-07-15 19:35:49 +0200
commit8dff9d564dfbf4841f03a919df44e8ae3d76de25 (patch)
tree787a083ac9efc5e3a67f271e7fe6bc4a22d0ea94 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC_OLD-8dff9d564dfbf4841f03a919df44e8ae3d76de25.zip
opensim-SC_OLD-8dff9d564dfbf4841f03a919df44e8ae3d76de25.tar.gz
opensim-SC_OLD-8dff9d564dfbf4841f03a919df44e8ae3d76de25.tar.bz2
opensim-SC_OLD-8dff9d564dfbf4841f03a919df44e8ae3d76de25.tar.xz
Revert "Add localid support to ch0de properly"
This reverts commit bb402d0d95c934fbcd8b1c03e228ec1d0a14f14d.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs6
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2214f2f..980f7a3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1633,8 +1633,7 @@ namespace OpenSim.Region.Framework.Scenes
1633 AbsolutePosition, 1633 AbsolutePosition,
1634 Scale, 1634 Scale,
1635 RotationOffset, 1635 RotationOffset,
1636 RigidBody, 1636 RigidBody);
1637 m_localId);
1638 PhysActor.SetMaterial(Material); 1637 PhysActor.SetMaterial(Material);
1639 } 1638 }
1640 catch 1639 catch
@@ -4443,8 +4442,7 @@ namespace OpenSim.Region.Framework.Scenes
4443 AbsolutePosition, 4442 AbsolutePosition,
4444 Scale, 4443 Scale,
4445 RotationOffset, 4444 RotationOffset,
4446 UsePhysics, 4445 UsePhysics);
4447 m_localId);
4448 PhysActor.SetMaterial(Material); 4446 PhysActor.SetMaterial(Material);
4449 4447
4450 pa = PhysActor; 4448 pa = PhysActor;