OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disable GetAsset (ViewerAsset) cap. Current viewers implementation is not compatible with opensim

0.9.1.0-post-fixes
UbitUmarov 2018-12-07 03:31:38 +00:00
parent 58b68aa5e9
commit ede7f28184
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
View File

@ -113,10 +113,11 @@ namespace OpenSim.Region.ClientStack.Linden
m_GetMesh2URL = config.GetString("Cap_GetMesh2", string.Empty); m_GetMesh2URL = config.GetString("Cap_GetMesh2", string.Empty);
if (m_GetMesh2URL != string.Empty) if (m_GetMesh2URL != string.Empty)
m_Enabled = true; m_Enabled = true;
/*
m_GetAssetURL = config.GetString("Cap_GetAsset", string.Empty); m_GetAssetURL = config.GetString("Cap_GetAsset", string.Empty);
if (m_GetAssetURL != string.Empty) if (m_GetAssetURL != string.Empty)
m_Enabled = true; m_Enabled = true;
*/
} }
public void AddRegion(Scene pScene) public void AddRegion(Scene pScene)
@ -440,6 +441,7 @@ namespace OpenSim.Region.ClientStack.Linden
else if (m_GetMesh2URL != string.Empty) else if (m_GetMesh2URL != string.Empty)
caps.RegisterHandler("GetMesh2", m_GetMesh2URL); caps.RegisterHandler("GetMesh2", m_GetMesh2URL);
/* we can't support this cap. Current viewers connect to the workng regions.
//ViewerAsset //ViewerAsset
if (m_GetAssetURL == "localhost") if (m_GetAssetURL == "localhost")
{ {
@ -457,6 +459,7 @@ namespace OpenSim.Region.ClientStack.Linden
} }
else if (m_GetAssetURL != string.Empty) else if (m_GetAssetURL != string.Empty)
caps.RegisterHandler("ViewerAsset", m_GetMesh2URL); caps.RegisterHandler("ViewerAsset", m_GetMesh2URL);
*/
} }
private void DeregisterCaps(UUID agentID, Caps caps) private void DeregisterCaps(UUID agentID, Caps caps)
@ -477,11 +480,13 @@ namespace OpenSim.Region.ClientStack.Linden
MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl); MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl);
m_capsDictGetMesh2.Remove(agentID); m_capsDictGetMesh2.Remove(agentID);
} }
/*
if (m_capsDictGetAsset.TryGetValue(agentID, out capUrl)) if (m_capsDictGetAsset.TryGetValue(agentID, out capUrl))
{ {
MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl); MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl);
m_capsDictGetAsset.Remove(agentID); m_capsDictGetAsset.Remove(agentID);
} }
*/
} }
} }
} }

1
bin/OpenSimDefaults.ini
View File

@ -792,7 +792,6 @@
Cap_GetTexture = "localhost" Cap_GetTexture = "localhost"
Cap_GetMesh = "localhost" Cap_GetMesh = "localhost"
Cap_GetMesh2 = "localhost" Cap_GetMesh2 = "localhost"
Cap_GetAsset = "localhost"
Cap_GetObjectCost = "" Cap_GetObjectCost = ""
Cap_GetObjectPhysicsData = "" Cap_GetObjectPhysicsData = ""
Cap_GroupProposalBallot = "" Cap_GroupProposalBallot = ""