From 056a6ee7653b17d8c1d92519f34f029bcd602143 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 26 Jul 2013 19:22:30 +0100
Subject: Fix regression tests relating to agent transfer by making simulator
 use last week's SIMULATOR/0.1 protocol for now.

---
 OpenSim/Framework/Servers/MainServer.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index d189580..57931d4 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -285,7 +285,12 @@ namespace OpenSim.Framework.Servers
         public static bool RemoveHttpServer(uint port)
         {
             lock (m_Servers)
+            {
+                if (instance != null && instance.Port == port)
+                    instance = null;
+
                 return m_Servers.Remove(port);
+            }
         }
 
         /// <summary>
-- 
cgit v1.1


From 3dac92f345cf69244cbbd10e65d5a8c04da710f5 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 26 Jul 2013 21:40:04 -0700
Subject: Increased the rate of the PollServiceRequestManager to 0.5 secs (it
 was 1sec). Group chat is going over the EQ... Hopefully this won't increase
 CPU when there's nothing going on, but we need to watch for that.

---
 OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index d83daab..6ab05d0 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             // directly back in the "ready-to-serve" queue by the worker thread.
             while (m_running)
             {
-                Thread.Sleep(1000); 
+                Thread.Sleep(500); 
                 Watchdog.UpdateThread();
 
                 List<PollServiceHttpRequest> not_ready = new List<PollServiceHttpRequest>();
-- 
cgit v1.1


From 69975763d2a735eb2696d2e27e5796a472a208ea Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 27 Jul 2013 15:38:56 -0700
Subject: Several major improvements to group (V2) chat. Specifically: handle
 join/drop appropriately, invitechatboxes. The major departure from flotsam is
 to send only one message per destination region, as opposed to one message
 per group member. This reduces messaging considerably in large groups that
 have clusters of members in certain regions.

---
 OpenSim/Framework/GridInstantMessage.cs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs
index 6ae0488..da3690c 100644
--- a/OpenSim/Framework/GridInstantMessage.cs
+++ b/OpenSim/Framework/GridInstantMessage.cs
@@ -53,6 +53,24 @@ namespace OpenSim.Framework
             binaryBucket = new byte[0];
         }
 
+        public GridInstantMessage(GridInstantMessage im, bool addTimestamp)
+        {
+            fromAgentID = im.fromAgentID;
+            fromAgentName = im.fromAgentName;
+            toAgentID = im.toAgentID;
+            dialog = im.dialog;
+            fromGroup = im.fromGroup;
+            message = im.message;
+            imSessionID = im.imSessionID;
+            offline = im.offline;
+            Position = im.Position;
+            binaryBucket = im.binaryBucket;
+            RegionID = im.RegionID;
+
+            if (addTimestamp)
+                timestamp = (uint)Util.UnixTimeSinceEpoch();
+        }
+
         public GridInstantMessage(IScene scene, UUID _fromAgentID,
                 string _fromAgentName, UUID _toAgentID,
                 byte _dialog, bool _fromGroup, string _message,
-- 
cgit v1.1