From f5799ff445670a8d3468f045694602d1430d2732 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 14 Nov 2015 08:10:27 -0800 Subject: [PATCH] That didn't actually do anything for Simian, and it broke the locahost case Revert "Also restoring proper function for Simian external GetTexture functionality." This reverts commit 366e81b977e7fcad4b19aeedc6f3674612b7587b. --- .../ClientStack/Linden/Caps/GetTextureModule.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs index 12cfa5d785..79a345857a 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs @@ -389,16 +389,17 @@ namespace OpenSim.Region.ClientStack.Linden port = MainServer.Instance.SSLPort; protocol = "https"; } + IExternalCapsModule handler = m_scene.RequestModuleInterface(); + if (handler != null) + handler.RegisterExternalUserCapsHandler(agentID, caps, "GetTexture", capUrl); + else + caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); m_pollservices[agentID] = args; m_capsDict[agentID] = capUrl; } else { - IExternalCapsModule handler = m_scene.RequestModuleInterface(); - if (handler != null) - handler.RegisterExternalUserCapsHandler(agentID, caps, "GetTexture", m_Url); - else - caps.RegisterHandler("GetTexture", m_Url); + caps.RegisterHandler("GetTexture", m_Url); } }