From 964ec57ffe5ce2e9feac4295ade9cc4a5a223d69 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 16 Dec 2011 17:24:50 -0800
Subject: Changed the async approach on close child agents. This may improve
 crossings a little bit.

---
 OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 9 +++------
 OpenSim/Region/Framework/Scenes/ScenePresence.cs             | 5 ++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index d76ed3e..58a7b20 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -204,13 +204,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="regionslst"></param>
         public void SendCloseChildAgentConnections(UUID agentID, List<ulong> regionslst)
         {
-            Util.FireAndForget(delegate
+            foreach (ulong handle in regionslst)
             {
-                foreach (ulong handle in regionslst)
-                {
-                    SendCloseChildAgent(agentID, handle);
-                }
-            });
+                SendCloseChildAgent(agentID, handle);
+            }
         }
        
         public List<GridRegion> RequestNamedRegions(string name, int maxNumber)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 800b7e0..b16eaba 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2955,7 +2955,10 @@ namespace OpenSim.Region.Framework.Scenes
             if (byebyeRegions.Count > 0)
             {
                 m_log.Debug("[SCENE PRESENCE]: Closing " + byebyeRegions.Count + " child agents");
-                m_scene.SceneGridService.SendCloseChildAgentConnections(ControllingClient.AgentId, byebyeRegions);
+                Util.FireAndForget(delegate 
+                { 
+                    m_scene.SceneGridService.SendCloseChildAgentConnections(ControllingClient.AgentId, byebyeRegions); 
+                });
             }
             
             foreach (ulong handle in byebyeRegions)
-- 
cgit v1.1


From fa0a71253f0c824b6fc952c1a8927c8f189892b9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 20 Dec 2011 18:54:15 +0000
Subject: Though the viewer warns about receiving this, not sending appears to
 break baked texture caching when crossing region boundaries.

Needs further investigation.

Revert "Stop sending the viewer its own AvatarAppearance packet."

This reverts commit 92039f295d7fe66bf1a09b29483f9057e395839e.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 36d8c0b..b8ae553 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2532,10 +2532,7 @@ namespace OpenSim.Region.Framework.Scenes
             // again here... this comes after the cached appearance check because the avatars
             // appearance goes into the avatar update packet
             SendAvatarDataToAllAgents();
-
-            // Sending us our own appearance does not seem to be necessary, and the viewer warns in the log if you do
-            // this.
-//            SendAppearanceToAgent(this);
+            SendAppearanceToAgent(this);
 
             // If we are using the the cached appearance then send it out to everyone
             if (cachedappearance)
-- 
cgit v1.1