diff options
author | CasperW | 2009-12-23 14:15:27 +0100 |
---|---|---|
committer | CasperW | 2009-12-23 14:15:27 +0100 |
commit | c54e0953d09f74be65f7f1939af16afcb8ade054 (patch) | |
tree | 30fdda415425190bb50a752d7b84f64e0a29db9b /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Added some null reference and deleted group checks to certain functions to fi... (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-c54e0953d09f74be65f7f1939af16afcb8ade054.zip opensim-SC-c54e0953d09f74be65f7f1939af16afcb8ade054.tar.gz opensim-SC-c54e0953d09f74be65f7f1939af16afcb8ade054.tar.bz2 opensim-SC-c54e0953d09f74be65f7f1939af16afcb8ade054.tar.xz |
Merge branch 'master' of ssh://TOR/var/git/careminster
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; |