aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorMelanie2011-07-15 19:30:23 +0200
committerMelanie2011-07-15 19:30:23 +0200
commit8925fb5537f9abe150fb2dcf8345a329aaedc9f5 (patch)
treef1e1791757cef6d0818d7c5d16b9fec687bf55cc /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentAdd localid support to ch0de properly (diff)
downloadopensim-SC_OLD-8925fb5537f9abe150fb2dcf8345a329aaedc9f5.zip
opensim-SC_OLD-8925fb5537f9abe150fb2dcf8345a329aaedc9f5.tar.gz
opensim-SC_OLD-8925fb5537f9abe150fb2dcf8345a329aaedc9f5.tar.bz2
opensim-SC_OLD-8925fb5537f9abe150fb2dcf8345a329aaedc9f5.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 482597d..aeb03a2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1767,7 +1767,8 @@ namespace OpenSim.Region.Framework.Scenes
1767 part.AbsolutePosition, 1767 part.AbsolutePosition,
1768 part.Scale, 1768 part.Scale,
1769 part.RotationOffset, 1769 part.RotationOffset,
1770 part.PhysActor.IsPhysical); 1770 part.PhysActor.IsPhysical,
1771 m_localId);
1771 part.PhysActor.SetMaterial((int)part.Material); 1772 part.PhysActor.SetMaterial((int)part.Material);
1772 1773
1773 part.PhysActor.LocalID = part.LocalId; 1774 part.PhysActor.LocalID = part.LocalId;