diff options
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 4a36b5d..f71871e 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -90,7 +90,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
90 | public event ObjectAttach OnObjectAttach; | 90 | public event ObjectAttach OnObjectAttach; |
91 | public event ObjectDeselect OnObjectDetach; | 91 | public event ObjectDeselect OnObjectDetach; |
92 | public event ObjectDrop OnObjectDrop; | 92 | public event ObjectDrop OnObjectDrop; |
93 | public event GenericCall1 OnCompleteMovementToRegion; | 93 | public event Action<IClientAPI, bool> OnCompleteMovementToRegion; |
94 | public event UpdateAgent OnPreAgentUpdate; | 94 | public event UpdateAgent OnPreAgentUpdate; |
95 | public event UpdateAgent OnAgentUpdate; | 95 | public event UpdateAgent OnAgentUpdate; |
96 | public event AgentRequestSit OnAgentRequestSit; | 96 | public event AgentRequestSit OnAgentRequestSit; |
@@ -231,7 +231,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
231 | public event ScriptReset OnScriptReset; | 231 | public event ScriptReset OnScriptReset; |
232 | public event GetScriptRunning OnGetScriptRunning; | 232 | public event GetScriptRunning OnGetScriptRunning; |
233 | public event SetScriptRunning OnSetScriptRunning; | 233 | public event SetScriptRunning OnSetScriptRunning; |
234 | public event Action<Vector3> OnAutoPilotGo; | 234 | public event Action<Vector3, bool> OnAutoPilotGo; |
235 | public event TerrainUnacked OnUnackedTerrain; | 235 | public event TerrainUnacked OnUnackedTerrain; |
236 | public event ActivateGesture OnActivateGesture; | 236 | public event ActivateGesture OnActivateGesture; |
237 | public event DeactivateGesture OnDeactivateGesture; | 237 | public event DeactivateGesture OnDeactivateGesture; |
@@ -512,7 +512,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
512 | m_udpServer.Flush(m_udpClient); | 512 | m_udpServer.Flush(m_udpClient); |
513 | 513 | ||
514 | // Remove ourselves from the scene | 514 | // Remove ourselves from the scene |
515 | m_scene.RemoveClient(AgentId); | 515 | m_scene.RemoveClient(AgentId, true); |
516 | 516 | ||
517 | // We can't reach into other scenes and close the connection | 517 | // We can't reach into other scenes and close the connection |
518 | // We need to do this over grid communications | 518 | // We need to do this over grid communications |
@@ -692,7 +692,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
692 | 692 | ||
693 | public virtual void Start() | 693 | public virtual void Start() |
694 | { | 694 | { |
695 | m_scene.AddNewClient(this); | 695 | m_scene.AddNewClient(this, PresenceType.User); |
696 | 696 | ||
697 | RefreshGroupMembership(); | 697 | RefreshGroupMembership(); |
698 | } | 698 | } |
@@ -6195,10 +6195,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6195 | 6195 | ||
6196 | private bool HandleCompleteAgentMovement(IClientAPI sender, Packet Pack) | 6196 | private bool HandleCompleteAgentMovement(IClientAPI sender, Packet Pack) |
6197 | { | 6197 | { |
6198 | GenericCall1 handlerCompleteMovementToRegion = OnCompleteMovementToRegion; | 6198 | Action<IClientAPI, bool> handlerCompleteMovementToRegion = OnCompleteMovementToRegion; |
6199 | if (handlerCompleteMovementToRegion != null) | 6199 | if (handlerCompleteMovementToRegion != null) |
6200 | { | 6200 | { |
6201 | handlerCompleteMovementToRegion(sender); | 6201 | handlerCompleteMovementToRegion(sender, true); |
6202 | } | 6202 | } |
6203 | handlerCompleteMovementToRegion = null; | 6203 | handlerCompleteMovementToRegion = null; |
6204 | 6204 | ||
@@ -11628,9 +11628,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11628 | locy = Convert.ToSingle(args[1]) - (float)regionY; | 11628 | locy = Convert.ToSingle(args[1]) - (float)regionY; |
11629 | locz = Convert.ToSingle(args[2]); | 11629 | locz = Convert.ToSingle(args[2]); |
11630 | 11630 | ||
11631 | Action<Vector3> handlerAutoPilotGo = OnAutoPilotGo; | 11631 | Action<Vector3, bool> handlerAutoPilotGo = OnAutoPilotGo; |
11632 | if (handlerAutoPilotGo != null) | 11632 | if (handlerAutoPilotGo != null) |
11633 | handlerAutoPilotGo(new Vector3(locx, locy, locz)); | 11633 | handlerAutoPilotGo(new Vector3(locx, locy, locz), false); |
11634 | } | 11634 | } |
11635 | 11635 | ||
11636 | /// <summary> | 11636 | /// <summary> |