aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2018-12-07 03:31:38 +0000
committerUbitUmarov2018-12-07 03:31:38 +0000
commitede7f281841a8ec5dd024c2292c33660f4ed3b83 (patch)
tree045e102377be2a94008d82ff9cdd0d38f126943b /OpenSim/Region
parentfix compile putting back useless things until they are fully removed (diff)
downloadopensim-SC-ede7f281841a8ec5dd024c2292c33660f4ed3b83.zip
opensim-SC-ede7f281841a8ec5dd024c2292c33660f4ed3b83.tar.gz
opensim-SC-ede7f281841a8ec5dd024c2292c33660f4ed3b83.tar.bz2
opensim-SC-ede7f281841a8ec5dd024c2292c33660f4ed3b83.tar.xz
disable GetAsset (ViewerAsset) cap. Current viewers implementation is not compatible with opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
index 1208bdf..b30d949 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
113 m_GetMesh2URL = config.GetString("Cap_GetMesh2", string.Empty); 113 m_GetMesh2URL = config.GetString("Cap_GetMesh2", string.Empty);
114 if (m_GetMesh2URL != string.Empty) 114 if (m_GetMesh2URL != string.Empty)
115 m_Enabled = true; 115 m_Enabled = true;
116 116/*
117 m_GetAssetURL = config.GetString("Cap_GetAsset", string.Empty); 117 m_GetAssetURL = config.GetString("Cap_GetAsset", string.Empty);
118 if (m_GetAssetURL != string.Empty) 118 if (m_GetAssetURL != string.Empty)
119 m_Enabled = true; 119 m_Enabled = true;
120*/
120 } 121 }
121 122
122 public void AddRegion(Scene pScene) 123 public void AddRegion(Scene pScene)
@@ -440,6 +441,7 @@ namespace OpenSim.Region.ClientStack.Linden
440 else if (m_GetMesh2URL != string.Empty) 441 else if (m_GetMesh2URL != string.Empty)
441 caps.RegisterHandler("GetMesh2", m_GetMesh2URL); 442 caps.RegisterHandler("GetMesh2", m_GetMesh2URL);
442 443
444/* we can't support this cap. Current viewers connect to the workng regions.
443 //ViewerAsset 445 //ViewerAsset
444 if (m_GetAssetURL == "localhost") 446 if (m_GetAssetURL == "localhost")
445 { 447 {
@@ -457,6 +459,7 @@ namespace OpenSim.Region.ClientStack.Linden
457 } 459 }
458 else if (m_GetAssetURL != string.Empty) 460 else if (m_GetAssetURL != string.Empty)
459 caps.RegisterHandler("ViewerAsset", m_GetMesh2URL); 461 caps.RegisterHandler("ViewerAsset", m_GetMesh2URL);
462*/
460 } 463 }
461 464
462 private void DeregisterCaps(UUID agentID, Caps caps) 465 private void DeregisterCaps(UUID agentID, Caps caps)
@@ -477,11 +480,13 @@ namespace OpenSim.Region.ClientStack.Linden
477 MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl); 480 MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl);
478 m_capsDictGetMesh2.Remove(agentID); 481 m_capsDictGetMesh2.Remove(agentID);
479 } 482 }
483/*
480 if (m_capsDictGetAsset.TryGetValue(agentID, out capUrl)) 484 if (m_capsDictGetAsset.TryGetValue(agentID, out capUrl))
481 { 485 {
482 MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl); 486 MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl);
483 m_capsDictGetAsset.Remove(agentID); 487 m_capsDictGetAsset.Remove(agentID);
484 } 488 }
489*/
485 } 490 }
486 } 491 }
487} 492}