diff options
author | UbitUmarov | 2016-08-21 20:00:27 +0100 |
---|---|---|
committer | UbitUmarov | 2016-08-21 20:00:27 +0100 |
commit | 0baaa23bde53bf47f4c8155c5927681bc6f3a5fc (patch) | |
tree | 03c9f3f334ea0163a73108287b73442bfb21ba9f /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | remove region combine option (mega region) for config ini files (diff) | |
download | opensim-SC-0baaa23bde53bf47f4c8155c5927681bc6f3a5fc.zip opensim-SC-0baaa23bde53bf47f4c8155c5927681bc6f3a5fc.tar.gz opensim-SC-0baaa23bde53bf47f4c8155c5927681bc6f3a5fc.tar.bz2 opensim-SC-0baaa23bde53bf47f4c8155c5927681bc6f3a5fc.tar.xz |
remove sceneGraph MoveObject and make it part of ProcessObjectGrabUpdate ( scene.PacketHandlers) where it belongs
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 7b1b3c9..88416e4 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3329,7 +3329,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
3329 | client.OnObjectRequest += RequestPrim; | 3329 | client.OnObjectRequest += RequestPrim; |
3330 | client.OnObjectSelect += SelectPrim; | 3330 | client.OnObjectSelect += SelectPrim; |
3331 | client.OnObjectDeselect += DeselectPrim; | 3331 | client.OnObjectDeselect += DeselectPrim; |
3332 | client.OnGrabUpdate += m_sceneGraph.MoveObject; | ||
3333 | client.OnSpinStart += m_sceneGraph.SpinStart; | 3332 | client.OnSpinStart += m_sceneGraph.SpinStart; |
3334 | client.OnSpinUpdate += m_sceneGraph.SpinObject; | 3333 | client.OnSpinUpdate += m_sceneGraph.SpinObject; |
3335 | client.OnDeRezObject += DeRezObjects; | 3334 | client.OnDeRezObject += DeRezObjects; |
@@ -3457,7 +3456,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
3457 | client.OnObjectRequest -= RequestPrim; | 3456 | client.OnObjectRequest -= RequestPrim; |
3458 | client.OnObjectSelect -= SelectPrim; | 3457 | client.OnObjectSelect -= SelectPrim; |
3459 | client.OnObjectDeselect -= DeselectPrim; | 3458 | client.OnObjectDeselect -= DeselectPrim; |
3460 | client.OnGrabUpdate -= m_sceneGraph.MoveObject; | ||
3461 | client.OnSpinStart -= m_sceneGraph.SpinStart; | 3459 | client.OnSpinStart -= m_sceneGraph.SpinStart; |
3462 | client.OnSpinUpdate -= m_sceneGraph.SpinObject; | 3460 | client.OnSpinUpdate -= m_sceneGraph.SpinObject; |
3463 | client.OnDeRezObject -= DeRezObjects; | 3461 | client.OnDeRezObject -= DeRezObjects; |
@@ -3472,6 +3470,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3472 | client.OnRequestObjectPropertiesFamily -= m_sceneGraph.RequestObjectPropertiesFamily; | 3470 | client.OnRequestObjectPropertiesFamily -= m_sceneGraph.RequestObjectPropertiesFamily; |
3473 | client.OnObjectPermissions -= HandleObjectPermissionsUpdate; | 3471 | client.OnObjectPermissions -= HandleObjectPermissionsUpdate; |
3474 | client.OnGrabObject -= ProcessObjectGrab; | 3472 | client.OnGrabObject -= ProcessObjectGrab; |
3473 | client.OnGrabUpdate -= ProcessObjectGrabUpdate; | ||
3475 | client.OnDeGrabObject -= ProcessObjectDeGrab; | 3474 | client.OnDeGrabObject -= ProcessObjectDeGrab; |
3476 | client.OnUndo -= m_sceneGraph.HandleUndo; | 3475 | client.OnUndo -= m_sceneGraph.HandleUndo; |
3477 | client.OnRedo -= m_sceneGraph.HandleRedo; | 3476 | client.OnRedo -= m_sceneGraph.HandleRedo; |