diff options
| author | Melanie | 2012-03-11 01:47:36 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-11 01:47:36 +0100 |
| commit | 0a4056ad2267656e6b2c07c7989690ecabc07b5f (patch) | |
| tree | 04f25af9832347f1a88890f9d8067f6f0e2155c9 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Changed undo redo internals. moved exec code to UndoState.cs from sop that n... (diff) | |
| download | opensim-SC_OLD-0a4056ad2267656e6b2c07c7989690ecabc07b5f.zip opensim-SC_OLD-0a4056ad2267656e6b2c07c7989690ecabc07b5f.tar.gz opensim-SC_OLD-0a4056ad2267656e6b2c07c7989690ecabc07b5f.tar.bz2 opensim-SC_OLD-0a4056ad2267656e6b2c07c7989690ecabc07b5f.tar.xz | |
Merge branch 'ubitwork'
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 68c05f8..a3358a5 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2811,6 +2811,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2811 | client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimGroupPosition; | 2811 | client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimGroupPosition; |
| 2812 | client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition; | 2812 | client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition; |
| 2813 | 2813 | ||
| 2814 | client.onClientChangeObject += m_sceneGraph.ClientChangeObject; | ||
| 2815 | |||
| 2814 | client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimGroupRotation; | 2816 | client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimGroupRotation; |
| 2815 | client.OnUpdatePrimGroupMouseRotation += m_sceneGraph.UpdatePrimGroupRotation; | 2817 | client.OnUpdatePrimGroupMouseRotation += m_sceneGraph.UpdatePrimGroupRotation; |
| 2816 | client.OnUpdatePrimSingleRotation += m_sceneGraph.UpdatePrimSingleRotation; | 2818 | client.OnUpdatePrimSingleRotation += m_sceneGraph.UpdatePrimSingleRotation; |
| @@ -2940,6 +2942,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2940 | client.OnUpdatePrimGroupPosition -= m_sceneGraph.UpdatePrimGroupPosition; | 2942 | client.OnUpdatePrimGroupPosition -= m_sceneGraph.UpdatePrimGroupPosition; |
| 2941 | client.OnUpdatePrimSinglePosition -= m_sceneGraph.UpdatePrimSinglePosition; | 2943 | client.OnUpdatePrimSinglePosition -= m_sceneGraph.UpdatePrimSinglePosition; |
| 2942 | 2944 | ||
| 2945 | client.onClientChangeObject -= m_sceneGraph.ClientChangeObject; | ||
| 2946 | |||
| 2943 | client.OnUpdatePrimGroupRotation -= m_sceneGraph.UpdatePrimGroupRotation; | 2947 | client.OnUpdatePrimGroupRotation -= m_sceneGraph.UpdatePrimGroupRotation; |
| 2944 | client.OnUpdatePrimGroupMouseRotation -= m_sceneGraph.UpdatePrimGroupRotation; | 2948 | client.OnUpdatePrimGroupMouseRotation -= m_sceneGraph.UpdatePrimGroupRotation; |
| 2945 | client.OnUpdatePrimSingleRotation -= m_sceneGraph.UpdatePrimSingleRotation; | 2949 | client.OnUpdatePrimSingleRotation -= m_sceneGraph.UpdatePrimSingleRotation; |