diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 12ee3b2..6385aed 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -607,7 +607,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
607 | 607 | ||
608 | // Disable UDP handling for this client | 608 | // Disable UDP handling for this client |
609 | m_udpClient.Shutdown(); | 609 | m_udpClient.Shutdown(); |
610 | 610 | ||
611 | 611 | ||
612 | //m_log.InfoFormat("[CLIENTVIEW] Memory pre GC {0}", System.GC.GetTotalMemory(false)); | 612 | //m_log.InfoFormat("[CLIENTVIEW] Memory pre GC {0}", System.GC.GetTotalMemory(false)); |
613 | //GC.Collect(); | 613 | //GC.Collect(); |
@@ -4912,6 +4912,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4912 | IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); | 4912 | IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); |
4913 | if (eq != null) | 4913 | if (eq != null) |
4914 | { | 4914 | { |
4915 | |||
4915 | OSD message_body = updateMessage.Serialize(); | 4916 | OSD message_body = updateMessage.Serialize(); |
4916 | // Add new fields here until OMV has them | 4917 | // Add new fields here until OMV has them |
4917 | OSDMap bodyMap = (OSDMap)message_body; | 4918 | OSDMap bodyMap = (OSDMap)message_body; |
@@ -4923,8 +4924,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4923 | OSDMap message = new OSDMap(); | 4924 | OSDMap message = new OSDMap(); |
4924 | message.Add("message", OSD.FromString("ParcelProperties")); | 4925 | message.Add("message", OSD.FromString("ParcelProperties")); |
4925 | message.Add("body", message_body); | 4926 | message.Add("body", message_body); |
4927 | |||
4926 | eq.Enqueue (message, this.AgentId); | 4928 | eq.Enqueue (message, this.AgentId); |
4927 | //eq.ParcelProperties(updateMessage, this.AgentId); | 4929 | |
4930 | // eq.ParcelProperties(updateMessage, this.AgentId); | ||
4928 | } | 4931 | } |
4929 | else | 4932 | else |
4930 | { | 4933 | { |
@@ -12420,8 +12423,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
12420 | uint regionY = 0; | 12423 | uint regionY = 0; |
12421 | 12424 | ||
12422 | Utils.LongToUInts(m_scene.RegionInfo.RegionHandle, out regionX, out regionY); | 12425 | Utils.LongToUInts(m_scene.RegionInfo.RegionHandle, out regionX, out regionY); |
12423 | locx = Convert.ToSingle(args[0]) - (float)regionX; | 12426 | locx = (float)(Convert.ToDouble(args[0]) - (double)regionX); |
12424 | locy = Convert.ToSingle(args[1]) - (float)regionY; | 12427 | locy = (float)(Convert.ToDouble(args[1]) - (double)regionY); |
12425 | locz = Convert.ToSingle(args[2]); | 12428 | locz = Convert.ToSingle(args[2]); |
12426 | 12429 | ||
12427 | Action<Vector3, bool, bool> handlerAutoPilotGo = OnAutoPilotGo; | 12430 | Action<Vector3, bool, bool> handlerAutoPilotGo = OnAutoPilotGo; |