diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs index 1208bdff6c..b30d949e3c 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs @@ -113,10 +113,11 @@ namespace OpenSim.Region.ClientStack.Linden m_GetMesh2URL = config.GetString("Cap_GetMesh2", string.Empty); if (m_GetMesh2URL != string.Empty) m_Enabled = true; - +/* m_GetAssetURL = config.GetString("Cap_GetAsset", string.Empty); if (m_GetAssetURL != string.Empty) m_Enabled = true; +*/ } public void AddRegion(Scene pScene) @@ -440,6 +441,7 @@ namespace OpenSim.Region.ClientStack.Linden else if (m_GetMesh2URL != string.Empty) caps.RegisterHandler("GetMesh2", m_GetMesh2URL); +/* we can't support this cap. Current viewers connect to the workng regions. //ViewerAsset if (m_GetAssetURL == "localhost") { @@ -457,6 +459,7 @@ namespace OpenSim.Region.ClientStack.Linden } else if (m_GetAssetURL != string.Empty) caps.RegisterHandler("ViewerAsset", m_GetMesh2URL); +*/ } private void DeregisterCaps(UUID agentID, Caps caps) @@ -477,11 +480,13 @@ namespace OpenSim.Region.ClientStack.Linden MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl); m_capsDictGetMesh2.Remove(agentID); } +/* if (m_capsDictGetAsset.TryGetValue(agentID, out capUrl)) { MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl); m_capsDictGetAsset.Remove(agentID); } +*/ } } } diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 2ee5534349..60db143827 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -792,7 +792,6 @@ Cap_GetTexture = "localhost" Cap_GetMesh = "localhost" Cap_GetMesh2 = "localhost" - Cap_GetAsset = "localhost" Cap_GetObjectCost = "" Cap_GetObjectPhysicsData = "" Cap_GroupProposalBallot = ""