ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 22:26:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

That didn't actually do anything for Simian, and it broke the locahost

Browse Source 
case
Revert "Also restoring proper function for Simian external GetTexture functionality."

This reverts commit 366e81b977.
This commit is contained in:
Diva Canto
2015-11-14 08:10:27 -08:00
parent 6f45c31ea0
commit f5799ff445
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
View File

@@ -389,16 +389,17 @@ 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
{
IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
if (handler != null)
handler.RegisterExternalUserCapsHandler(agentID, caps, "GetTexture", m_Url);
else
caps.RegisterHandler("GetTexture", m_Url);
caps.RegisterHandler("GetTexture", m_Url);
}
}