From 4e45718833f72b9149aed6d503e967b8916e5d08 Mon Sep 17 00:00:00 2001
From: Mikko Pallari
Date: Thu, 15 Apr 2010 08:23:51 +0300
Subject: Added overload of SendGenericMessage to LLClientView with string list
 as parameter. Now modules themselfs don't necessarily need to convert strings
 to byte arrays. Added this as it was removed in LightShare patch.

---
 OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'OpenSim/Region/ClientStack/LindenUDP')

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 9eb35fa..e67428d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -816,6 +816,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
+        public void SendGenericMessage(string method, List<string> message)
+        {
+            GenericMessagePacket gmp = new GenericMessagePacket();
+            gmp.MethodData.Method = Util.StringToBytes256(method);
+            gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count];
+            int i = 0;
+            foreach (string val in message)
+            {
+                gmp.ParamList[i] = new GenericMessagePacket.ParamListBlock();
+                gmp.ParamList[i++].Parameter = Util.StringToBytes256(val);
+            }
+
+            OutPacket(gmp, ThrottleOutPacketType.Task);
+        }
+
         public void SendGenericMessage(string method, List<byte[]> message)
         {
             GenericMessagePacket gmp = new GenericMessagePacket();
-- 
cgit v1.1


From f90d81a864c8ae1cf8125839bc883dc0ace7f214 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 26 May 2010 19:26:30 +0200
Subject: Just because there is an agent update handler, that doesn't mean
 there is a pre agent update handler. Null check these separately.

---
 OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/ClientStack/LindenUDP')

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 173c9e5..51cc763 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4922,14 +4922,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     arg.SessionID = x.SessionID;
                     arg.State = x.State;
                     UpdateAgent handlerAgentUpdate = OnAgentUpdate;
+                    UpdateAgent handlerPreAgentUpdate = OnPreAgentUpdate;
                     lastarg = arg; // save this set of arguments for nexttime
-                    if (handlerAgentUpdate != null)
-                    {
+                    if (handlerPreAgentUpdate != null)
                         OnPreAgentUpdate(this, arg);
+                    if (handlerAgentUpdate != null)
                         OnAgentUpdate(this, arg);
-                    }
 
                     handlerAgentUpdate = null;
+                    handlerPreAgentUpdate = null;
                 }
             }
 
-- 
cgit v1.1