aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2015-11-14 08:10:27 -0800
committerDiva Canto2015-11-14 08:10:27 -0800
commitf5799ff445670a8d3468f045694602d1430d2732 (patch)
tree5f4b5d51cef2b74bb60c52f6281384dde26acd85 /OpenSim/Region
parentMerge branch 'master' into avinationmerge (diff)
downloadopensim-SC_OLD-f5799ff445670a8d3468f045694602d1430d2732.zip
opensim-SC_OLD-f5799ff445670a8d3468f045694602d1430d2732.tar.gz
opensim-SC_OLD-f5799ff445670a8d3468f045694602d1430d2732.tar.bz2
opensim-SC_OLD-f5799ff445670a8d3468f045694602d1430d2732.tar.xz
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.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 12cfa5d..79a3458 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
389 port = MainServer.Instance.SSLPort; 389 port = MainServer.Instance.SSLPort;
390 protocol = "https"; 390 protocol = "https";
391 } 391 }
392 IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
393 if (handler != null)
394 handler.RegisterExternalUserCapsHandler(agentID, caps, "GetTexture", capUrl);
395 else
396 caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
392 m_pollservices[agentID] = args; 397 m_pollservices[agentID] = args;
393 m_capsDict[agentID] = capUrl; 398 m_capsDict[agentID] = capUrl;
394 } 399 }
395 else 400 else
396 { 401 {
397 IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>(); 402 caps.RegisterHandler("GetTexture", m_Url);
398 if (handler != null)
399 handler.RegisterExternalUserCapsHandler(agentID, caps, "GetTexture", m_Url);
400 else
401 caps.RegisterHandler("GetTexture", m_Url);
402 } 403 }
403 } 404 }
404 405