diff options
| author | Kitto Flora | 2009-12-22 00:33:31 -0500 |
|---|---|---|
| committer | Kitto Flora | 2009-12-22 00:33:31 -0500 |
| commit | 93b930b9370b1439c4416c08a45fe7f23a5862c7 (patch) | |
| tree | e3546d86b64e9e2c13c4fba40a364857bfb0a8e7 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Include ChOdePlugin (diff) | |
| parent | Should not commit without compiling (diff) | |
| download | opensim-SC_OLD-93b930b9370b1439c4416c08a45fe7f23a5862c7.zip opensim-SC_OLD-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.gz opensim-SC_OLD-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.bz2 opensim-SC_OLD-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.xz | |
Fix conflicts
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index eacd219..f8498c6 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1853,7 +1853,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1853 | } | 1853 | } |
| 1854 | } | 1854 | } |
| 1855 | } | 1855 | } |
| 1856 | 1856 | ||
| 1857 | public void rotLookAt(Quaternion target, float strength, float damping) | 1857 | public void rotLookAt(Quaternion target, float strength, float damping) |
| 1858 | { | 1858 | { |
| 1859 | SceneObjectPart rootpart = m_rootPart; | 1859 | SceneObjectPart rootpart = m_rootPart; |
| @@ -1880,6 +1880,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1880 | } | 1880 | } |
| 1881 | } | 1881 | } |
| 1882 | } | 1882 | } |
| 1883 | |||
| 1883 | public void stopLookAt() | 1884 | public void stopLookAt() |
| 1884 | { | 1885 | { |
| 1885 | SceneObjectPart rootpart = m_rootPart; | 1886 | SceneObjectPart rootpart = m_rootPart; |