diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
3 files changed, 11 insertions, 10 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 8db4e67..ff889ea 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -232,7 +232,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
232 | public string SeedCapRequest(string request, string path, string param, | 232 | public string SeedCapRequest(string request, string path, string param, |
233 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 233 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
234 | { | 234 | { |
235 | m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName); | 235 | // m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName); |
236 | 236 | ||
237 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) | 237 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) |
238 | { | 238 | { |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs index e0807ee..e7bd2e7 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | |||
@@ -50,8 +50,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
50 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 50 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] |
51 | public class GetMeshModule : INonSharedRegionModule | 51 | public class GetMeshModule : INonSharedRegionModule |
52 | { | 52 | { |
53 | private static readonly ILog m_log = | 53 | // private static readonly ILog m_log = |
54 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
56 | private Scene m_scene; | 56 | private Scene m_scene; |
57 | private IAssetService m_AssetService; | 57 | private IAssetService m_AssetService; |
@@ -113,12 +113,12 @@ namespace OpenSim.Region.ClientStack.Linden | |||
113 | 113 | ||
114 | public void RegisterCaps(UUID agentID, Caps caps) | 114 | public void RegisterCaps(UUID agentID, Caps caps) |
115 | { | 115 | { |
116 | UUID capID = UUID.Random(); | 116 | // UUID capID = UUID.Random(); |
117 | 117 | ||
118 | //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); | 118 | //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); |
119 | if (m_URL == "localhost") | 119 | if (m_URL == "localhost") |
120 | { | 120 | { |
121 | m_log.InfoFormat("[GETMESH]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); | 121 | // m_log.DebugFormat("[GETMESH]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); |
122 | GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService); | 122 | GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService); |
123 | IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(), | 123 | IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(), |
124 | delegate(Hashtable m_dhttpMethod) | 124 | delegate(Hashtable m_dhttpMethod) |
@@ -130,7 +130,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
130 | } | 130 | } |
131 | else | 131 | else |
132 | { | 132 | { |
133 | m_log.InfoFormat("[GETMESH]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName); | 133 | // m_log.DebugFormat("[GETMESH]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName); |
134 | caps.RegisterHandler("GetMesh", m_URL); | 134 | caps.RegisterHandler("GetMesh", m_URL); |
135 | } | 135 | } |
136 | } | 136 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs index 35eedb4..fffcee2 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | |||
@@ -54,8 +54,9 @@ namespace OpenSim.Region.ClientStack.Linden | |||
54 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 54 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] |
55 | public class GetTextureModule : INonSharedRegionModule | 55 | public class GetTextureModule : INonSharedRegionModule |
56 | { | 56 | { |
57 | private static readonly ILog m_log = | 57 | // private static readonly ILog m_log = |
58 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 58 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
59 | |||
59 | private Scene m_scene; | 60 | private Scene m_scene; |
60 | private IAssetService m_assetService; | 61 | private IAssetService m_assetService; |
61 | 62 | ||
@@ -128,12 +129,12 @@ namespace OpenSim.Region.ClientStack.Linden | |||
128 | //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); | 129 | //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); |
129 | if (m_URL == "localhost") | 130 | if (m_URL == "localhost") |
130 | { | 131 | { |
131 | m_log.InfoFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); | 132 | // m_log.DebugFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); |
132 | caps.RegisterHandler("GetTexture", new GetTextureHandler("/CAPS/" + capID + "/", m_assetService)); | 133 | caps.RegisterHandler("GetTexture", new GetTextureHandler("/CAPS/" + capID + "/", m_assetService)); |
133 | } | 134 | } |
134 | else | 135 | else |
135 | { | 136 | { |
136 | m_log.InfoFormat("[GETTEXTURE]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName); | 137 | // m_log.DebugFormat("[GETTEXTURE]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName); |
137 | caps.RegisterHandler("GetTexture", m_URL); | 138 | caps.RegisterHandler("GetTexture", m_URL); |
138 | } | 139 | } |
139 | } | 140 | } |