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

put back assetViewer cap code, to allow viewers testing. It is disabled at OpenSimDefaults, and should not be enabled until all major viewers do it right on opensim

0.9.1.0-post-fixes
UbitUmarov 2019-03-01 11:57:52 +00:00
parent 87733b196b
commit 8a8ce8b10a
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ namespace OpenSim.Region.ClientStack.Linden
private string m_GetTextureURL; private string m_GetTextureURL;
private string m_GetMeshURL; private string m_GetMeshURL;
private string m_GetMesh2URL; private string m_GetMesh2URL;
// private string m_GetAssetURL; private string m_GetAssetURL;
class APollRequest class APollRequest
{ {
@ -87,7 +87,7 @@ namespace OpenSim.Region.ClientStack.Linden
private Dictionary<UUID, string> m_capsDictTexture = new Dictionary<UUID, string>(); private Dictionary<UUID, string> m_capsDictTexture = new Dictionary<UUID, string>();
private Dictionary<UUID, string> m_capsDictGetMesh = new Dictionary<UUID, string>(); private Dictionary<UUID, string> m_capsDictGetMesh = new Dictionary<UUID, string>();
private Dictionary<UUID, string> m_capsDictGetMesh2 = new Dictionary<UUID, string>(); private Dictionary<UUID, string> m_capsDictGetMesh2 = new Dictionary<UUID, string>();
//private Dictionary<UUID, string> m_capsDictGetAsset = new Dictionary<UUID, string>(); private Dictionary<UUID, string> m_capsDictGetAsset = new Dictionary<UUID, string>();
#region Region Module interfaceBase Members #region Region Module interfaceBase Members
@ -113,11 +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)
@ -448,7 +448,6 @@ 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 wrong regions.
//ViewerAsset //ViewerAsset
if (m_GetAssetURL == "localhost") if (m_GetAssetURL == "localhost")
{ {
@ -466,7 +465,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)
@ -487,13 +486,12 @@ 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

@ -821,6 +821,7 @@
Cap_GetTexture = "localhost" Cap_GetTexture = "localhost"
Cap_GetMesh = "localhost" Cap_GetMesh = "localhost"
Cap_GetMesh2 = "localhost" Cap_GetMesh2 = "localhost"
; Cap_GetAsset = "localhost" DO not ucoment this line. Some popular viewers still dont do it right for opensim. Here to easy testing
Cap_GetObjectCost = "" Cap_GetObjectCost = ""
Cap_GetObjectPhysicsData = "" Cap_GetObjectPhysicsData = ""
Cap_GroupProposalBallot = "" Cap_GroupProposalBallot = ""