From f32a21d96707f87ecbdaf42c0059f8494a119d31 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 14 May 2013 08:12:01 -0700
Subject: HGTP-mesh bug: the mesh download requests were going to the departing
 sims for a little while. This was also true for local TPs. BUt for local TPs
 the assets are on the same server, so it doesn't matter. For HGTPs, it
 matters. This potential fix moves sending the initial data to later, after
 the client has completed the movement into the region. Fingers crossed that
 it doesn't mess other things up!

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 985aa4d..0fa1c0e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1371,9 +1371,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // circuit code to the existing child agent.  This is not particularly obvious.
                     SendAckImmediate(endPoint, uccp.Header.Sequence);
             
-                    // We only want to send initial data to new clients, not ones which are being converted from child to root.
-                    if (client != null)
-                        client.SceneAgent.SendInitialDataToMe();
                 }
                 else
                 {
-- 
cgit v1.1


From 645da54f25bb034eb76151daa9723763eae13303 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 14 May 2013 08:47:18 -0700
Subject: Revert "HGTP-mesh bug: the mesh download requests were going to the
 departing sims for a little while. This was also true for local TPs. BUt for
 local TPs the assets are on the same server, so it doesn't matter. For HGTPs,
 it matters. This potential fix moves sending the initial data to later, after
 the client has completed the movement into the region. Fingers crossed that
 it doesn't mess other things up!"

This reverts commit f32a21d96707f87ecbdaf42c0059f8494a119d31.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Region/ClientStack')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 0fa1c0e..985aa4d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1371,6 +1371,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // circuit code to the existing child agent.  This is not particularly obvious.
                     SendAckImmediate(endPoint, uccp.Header.Sequence);
             
+                    // We only want to send initial data to new clients, not ones which are being converted from child to root.
+                    if (client != null)
+                        client.SceneAgent.SendInitialDataToMe();
                 }
                 else
                 {
-- 
cgit v1.1


From 91091c3e5453088242e05a682283fc7f9f5c7ae3 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 14 May 2013 09:06:58 -0700
Subject: Second take at HGTP-mesh bug: delay sending the initial data only for
 agents that are coming via TP (root agents)

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/ClientStack')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 985aa4d..8eb2e06 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1373,7 +1373,13 @@ 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)
-                        client.SceneAgent.SendInitialDataToMe();
+                    {
+                        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 meshes from
+                        if (!tp)
+                            client.SceneAgent.SendInitialDataToMe();
+                    }
                 }
                 else
                 {
-- 
cgit v1.1


From df2a0fec5f2b0d7e9938c1bc1bdc965b767ec25f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 14 May 2013 20:11:58 +0100
Subject: Comment out log message about looking for asset data in remove asset
 service for now, in order to reduce log levels in a test region with many hg
 origin avatars

---
 OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/ClientStack')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
index afbe56b..a168bfe 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
@@ -426,7 +426,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     if (!assetServerURL.EndsWith("/") && !assetServerURL.EndsWith("="))
                         assetServerURL = assetServerURL + "/";
 
-                    m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", assetServerURL + id);
+//                    m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", assetServerURL + id);
                     AssetService.Get(assetServerURL + id, InventoryAccessModule, AssetReceived);
                     return;
                 }
-- 
cgit v1.1