aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rwxr-xr-xOpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs14
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
index 734425b..c071bd1 100755
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.ClientStack.Linden
59 private string m_GetTextureURL; 59 private string m_GetTextureURL;
60 private string m_GetMeshURL; 60 private string m_GetMeshURL;
61 private string m_GetMesh2URL; 61 private string m_GetMesh2URL;
62// private string m_GetAssetURL; 62 private string m_GetAssetURL;
63 63
64 class APollRequest 64 class APollRequest
65 { 65 {
@@ -87,7 +87,7 @@ namespace OpenSim.Region.ClientStack.Linden
87 private Dictionary<UUID, string> m_capsDictTexture = new Dictionary<UUID, string>(); 87 private Dictionary<UUID, string> m_capsDictTexture = new Dictionary<UUID, string>();
88 private Dictionary<UUID, string> m_capsDictGetMesh = new Dictionary<UUID, string>(); 88 private Dictionary<UUID, string> m_capsDictGetMesh = new Dictionary<UUID, string>();
89 private Dictionary<UUID, string> m_capsDictGetMesh2 = new Dictionary<UUID, string>(); 89 private Dictionary<UUID, string> m_capsDictGetMesh2 = new Dictionary<UUID, string>();
90 //private Dictionary<UUID, string> m_capsDictGetAsset = new Dictionary<UUID, string>(); 90 private Dictionary<UUID, string> m_capsDictGetAsset = new Dictionary<UUID, string>();
91 91
92 #region Region Module interfaceBase Members 92 #region Region Module interfaceBase Members
93 93
@@ -113,11 +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
123 public void AddRegion(Scene pScene) 123 public void AddRegion(Scene pScene)
@@ -448,7 +448,6 @@ namespace OpenSim.Region.ClientStack.Linden
448 else if (m_GetMesh2URL != string.Empty) 448 else if (m_GetMesh2URL != string.Empty)
449 caps.RegisterHandler("GetMesh2", m_GetMesh2URL); 449 caps.RegisterHandler("GetMesh2", m_GetMesh2URL);
450 450
451/* we can't support this cap. Current viewers connect to the wrong regions.
452 //ViewerAsset 451 //ViewerAsset
453 if (m_GetAssetURL == "localhost") 452 if (m_GetAssetURL == "localhost")
454 { 453 {
@@ -466,7 +465,7 @@ namespace OpenSim.Region.ClientStack.Linden
466 } 465 }
467 else if (m_GetAssetURL != string.Empty) 466 else if (m_GetAssetURL != string.Empty)
468 caps.RegisterHandler("ViewerAsset", m_GetMesh2URL); 467 caps.RegisterHandler("ViewerAsset", m_GetMesh2URL);
469*/ 468
470 } 469 }
471 470
472 private void DeregisterCaps(UUID agentID, Caps caps) 471 private void DeregisterCaps(UUID agentID, Caps caps)
@@ -487,13 +486,12 @@ namespace OpenSim.Region.ClientStack.Linden
487 MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl); 486 MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl);
488 m_capsDictGetMesh2.Remove(agentID); 487 m_capsDictGetMesh2.Remove(agentID);
489 } 488 }
490/* 489
491 if (m_capsDictGetAsset.TryGetValue(agentID, out capUrl)) 490 if (m_capsDictGetAsset.TryGetValue(agentID, out capUrl))
492 { 491 {
493 MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl); 492 MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl);
494 m_capsDictGetAsset.Remove(agentID); 493 m_capsDictGetAsset.Remove(agentID);
495 } 494 }
496*/
497 } 495 }
498 } 496 }
499} 497}