From 366e81b977e7fcad4b19aeedc6f3674612b7587b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 14 Oct 2015 14:45:21 -0700
Subject: Also restoring proper function for Simian external GetTexture
 functionality.

---
 OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 79a3458..12cfa5d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -389,17 +389,16 @@ namespace OpenSim.Region.ClientStack.Linden
                     port = MainServer.Instance.SSLPort;
                     protocol = "https";
                 }
-                IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
-                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
             {
-                caps.RegisterHandler("GetTexture", m_Url);
+                IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
+                if (handler != null)
+                    handler.RegisterExternalUserCapsHandler(agentID, caps, "GetTexture", m_Url);
+                else
+                    caps.RegisterHandler("GetTexture", m_Url);
             }
         }
 
-- 
cgit v1.1