diff options
author | Diva Canto | 2015-10-14 14:45:21 -0700 |
---|---|---|
committer | Diva Canto | 2015-10-14 14:45:21 -0700 |
commit | 366e81b977e7fcad4b19aeedc6f3674612b7587b (patch) | |
tree | f5eca5876d55cb702a8ac028311f239bb77b3012 | |
parent | Fixed Robust-bound GetTexture handler that had been knocked off with the new ... (diff) | |
download | opensim-SC_OLD-366e81b977e7fcad4b19aeedc6f3674612b7587b.zip opensim-SC_OLD-366e81b977e7fcad4b19aeedc6f3674612b7587b.tar.gz opensim-SC_OLD-366e81b977e7fcad4b19aeedc6f3674612b7587b.tar.bz2 opensim-SC_OLD-366e81b977e7fcad4b19aeedc6f3674612b7587b.tar.xz |
Also restoring proper function for Simian external GetTexture functionality.
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | 11 |
1 files changed, 5 insertions, 6 deletions
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 | |||
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)); | ||
397 | m_pollservices[agentID] = args; | 392 | m_pollservices[agentID] = args; |
398 | m_capsDict[agentID] = capUrl; | 393 | m_capsDict[agentID] = capUrl; |
399 | } | 394 | } |
400 | else | 395 | else |
401 | { | 396 | { |
402 | caps.RegisterHandler("GetTexture", m_Url); | 397 | IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>(); |
398 | if (handler != null) | ||
399 | handler.RegisterExternalUserCapsHandler(agentID, caps, "GetTexture", m_Url); | ||
400 | else | ||
401 | caps.RegisterHandler("GetTexture", m_Url); | ||
403 | } | 402 | } |
404 | } | 403 | } |
405 | 404 | ||