4 files changed, 26 insertions, 6 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index a381a1b..4c15ad8 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -264,7 +264,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     response["int_response_code"] = 500;
                     response["str_response_string"] = "Script timeout";
                     response["content_type"] = "text/plain";
-                    response["keepalive"] = false;
+                    response["keepalive"] = true;
                     response["reusecontext"] = false;
 
                     return response;
@@ -285,7 +285,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     response["int_response_code"] = 500;
                     response["str_response_string"] = "Script timeout";
                     response["content_type"] = "text/plain";
-                    response["keepalive"] = false;
+                    response["keepalive"] = true;
                     response["reusecontext"] = false;
 
                     lock (responses)
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index e053054..54e8d76 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -283,7 +283,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     response["int_response_code"] = 500;
                     response["str_response_string"] = "Script timeout";
                     response["content_type"] = "text/plain";
-                    response["keepalive"] = false;
+                    response["keepalive"] = true;
                     response["reusecontext"] = false;
 
                     return response;
@@ -300,11 +300,16 @@ namespace OpenSim.Region.ClientStack.Linden
                 {
                     response = new Hashtable();
 
+
                     response["int_response_code"] = 503;
                     response["str_response_string"] = "Throttled";
                     response["content_type"] = "text/plain";
-                    response["keepalive"] = false;
+                    response["keepalive"] = true;
                     response["reusecontext"] = false;
+
+                    Hashtable headers = new Hashtable();
+                    headers["Retry-After"] = 30;
+                    response["headers"] = headers;
                     
                     lock (responses)
                         responses[requestID] = new aPollResponse() {bytes = 0, response = response};
@@ -320,7 +325,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     response["int_response_code"] = 500;
                     response["str_response_string"] = "Script timeout";
                     response["content_type"] = "text/plain";
-                    response["keepalive"] = false;
+                    response["keepalive"] = true;
                     response["reusecontext"] = false;
                     
                     lock (responses)
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 4c0fba5..226f2a1 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -475,6 +475,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             set { m_disableFacelights = value; }
         }
 
+        public List<uint> SelectedObjects {get; private set;}
 
         public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } }
        
@@ -495,6 +496,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //            DebugPacketLevel = 1;
 
             CloseSyncLock = new Object();
+            SelectedObjects = new List<uint>();
 
             RegisterInterface<IClientIM>(this);
             RegisterInterface<IClientInventory>(this);
@@ -7389,6 +7391,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             for (int i = 0; i < incomingselect.ObjectData.Length; i++)
             {
+                if (!SelectedObjects.Contains(incomingselect.ObjectData[i].ObjectLocalID))
+                    SelectedObjects.Add(incomingselect.ObjectData[i].ObjectLocalID);
                 handlerObjectSelect = OnObjectSelect;
                 if (handlerObjectSelect != null)
                 {
@@ -7415,6 +7419,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             for (int i = 0; i < incomingdeselect.ObjectData.Length; i++)
             {
+                if (!SelectedObjects.Contains(incomingdeselect.ObjectData[i].ObjectLocalID))
+                    SelectedObjects.Add(incomingdeselect.ObjectData[i].ObjectLocalID);
                 handlerObjectDeselect = OnObjectDeselect;
                 if (handlerObjectDeselect != null)
                 {
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index f66534d..b5f9da8 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1757,6 +1757,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 AuthenticateResponse sessionInfo;
                 if (IsClientAuthorized(uccp, out sessionInfo))
                 {
+                    AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(uccp.CircuitCode.Code);
+
                     // Begin the process of adding the client to the simulator
                     client
                         = AddClient(
@@ -1766,6 +1768,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             endPoint,
                             sessionInfo);
 
+                    // This will be true if the client is new, e.g. not
+                    // an existing child agent, and there is no circuit data
+                    if (client != null && aCircuit == null)
+                    {
+                        m_scene.CloseAgent(client.AgentId, true);
+                        return;
+                    }
+
                     // Now we know we can handle more data
                     Thread.Sleep(200);
 
@@ -1802,7 +1812,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // We only want to send initial data to new clients, not ones which are being converted from child to root.
                     if (client != null)
                     {
-                        AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(uccp.CircuitCode.Code);
                         bool tp = (aCircuit.teleportFlags > 0);
                         // Let's delay this for TP agents, otherwise the viewer doesn't know where to get resources from
                         if (!tp)