aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-04-03 23:25:34 +0200
committerMelanie2012-04-03 23:25:34 +0200
commit1bded840b9f1b93829090a33a9f56dbfed2ce02a (patch)
tree37ac3853e8abd3d6ccdce662fdd81c86df346f99 /OpenSim
parentFix more merge artefacts (diff)
downloadopensim-SC_OLD-1bded840b9f1b93829090a33a9f56dbfed2ce02a.zip
opensim-SC_OLD-1bded840b9f1b93829090a33a9f56dbfed2ce02a.tar.gz
opensim-SC_OLD-1bded840b9f1b93829090a33a9f56dbfed2ce02a.tar.bz2
opensim-SC_OLD-1bded840b9f1b93829090a33a9f56dbfed2ce02a.tar.xz
More artefact
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index ca6b5cb..fde146c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2197,7 +2197,7 @@ namespace OpenSim.Region.Framework.Scenes
2197 2197
2198 public Vector3 GetTorque() 2198 public Vector3 GetTorque()
2199 { 2199 {
2200 return Torque; 2200 return RootPart.Torque;
2201 } 2201 }
2202 2202
2203 // This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object 2203 // This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object