diff options
author | Jonathan Freedman | 2010-10-07 23:47:39 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-07 23:47:39 -0400 |
commit | 4adada6fe48a960850639628c0f90e55c848235f (patch) | |
tree | 63f616d32f35012fe278a8cdeb9b3e762ecde37a /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.zip opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.tar.gz opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.tar.bz2 opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.tar.xz |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index fe0ab5b..0cfc235 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2735,7 +2735,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2735 | client.OnGrabUpdate += m_sceneGraph.MoveObject; | 2735 | client.OnGrabUpdate += m_sceneGraph.MoveObject; |
2736 | client.OnSpinStart += m_sceneGraph.SpinStart; | 2736 | client.OnSpinStart += m_sceneGraph.SpinStart; |
2737 | client.OnSpinUpdate += m_sceneGraph.SpinObject; | 2737 | client.OnSpinUpdate += m_sceneGraph.SpinObject; |
2738 | client.OnDeRezObject += DeRezObject; | 2738 | client.OnDeRezObject += DeRezObjects; |
2739 | 2739 | ||
2740 | client.OnObjectName += m_sceneGraph.PrimName; | 2740 | client.OnObjectName += m_sceneGraph.PrimName; |
2741 | client.OnObjectClickAction += m_sceneGraph.PrimClickAction; | 2741 | client.OnObjectClickAction += m_sceneGraph.PrimClickAction; |
@@ -2864,7 +2864,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2864 | client.OnGrabUpdate -= m_sceneGraph.MoveObject; | 2864 | client.OnGrabUpdate -= m_sceneGraph.MoveObject; |
2865 | client.OnSpinStart -= m_sceneGraph.SpinStart; | 2865 | client.OnSpinStart -= m_sceneGraph.SpinStart; |
2866 | client.OnSpinUpdate -= m_sceneGraph.SpinObject; | 2866 | client.OnSpinUpdate -= m_sceneGraph.SpinObject; |
2867 | client.OnDeRezObject -= DeRezObject; | 2867 | client.OnDeRezObject -= DeRezObjects; |
2868 | client.OnObjectName -= m_sceneGraph.PrimName; | 2868 | client.OnObjectName -= m_sceneGraph.PrimName; |
2869 | client.OnObjectClickAction -= m_sceneGraph.PrimClickAction; | 2869 | client.OnObjectClickAction -= m_sceneGraph.PrimClickAction; |
2870 | client.OnObjectMaterial -= m_sceneGraph.PrimMaterial; | 2870 | client.OnObjectMaterial -= m_sceneGraph.PrimMaterial; |