diff options
author | Justin Clark-Casey (justincc) | 2010-07-27 22:49:45 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-07-27 22:49:45 +0100 |
commit | b149d8970e0078b81e4b4784b633d95a419aeecb (patch) | |
tree | 4e31c3e30ae58734a42df8cfe89b1ed28bccc5e7 /OpenSim/Region/CoreModules/World/Media/Moap | |
parent | Update OpenMetaverse libraries to r3287 + r3294 (removal of OpenMetaverse.Htt... (diff) | |
download | opensim-SC_OLD-b149d8970e0078b81e4b4784b633d95a419aeecb.zip opensim-SC_OLD-b149d8970e0078b81e4b4784b633d95a419aeecb.tar.gz opensim-SC_OLD-b149d8970e0078b81e4b4784b633d95a419aeecb.tar.bz2 opensim-SC_OLD-b149d8970e0078b81e4b4784b633d95a419aeecb.tar.xz |
comment out verbose debug logging
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Media/Moap')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs | 70 |
1 files changed, 36 insertions, 34 deletions
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs index 3a86167..d53f573 100644 --- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs +++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs | |||
@@ -98,6 +98,8 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
98 | 98 | ||
99 | if (config != null && !config.GetBoolean("Enabled", false)) | 99 | if (config != null && !config.GetBoolean("Enabled", false)) |
100 | m_isEnabled = false; | 100 | m_isEnabled = false; |
101 | // else | ||
102 | // m_log.Debug("[MOAP]: Initialised module.")l | ||
101 | } | 103 | } |
102 | 104 | ||
103 | public void AddRegion(Scene scene) | 105 | public void AddRegion(Scene scene) |
@@ -135,8 +137,8 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
135 | 137 | ||
136 | public void OnRegisterCaps(UUID agentID, Caps caps) | 138 | public void OnRegisterCaps(UUID agentID, Caps caps) |
137 | { | 139 | { |
138 | m_log.DebugFormat( | 140 | // m_log.DebugFormat( |
139 | "[MOAP]: Registering ObjectMedia and ObjectMediaNavigate capabilities for agent {0}", agentID); | 141 | // "[MOAP]: Registering ObjectMedia and ObjectMediaNavigate capabilities for agent {0}", agentID); |
140 | 142 | ||
141 | string omCapUrl = "/CAPS/" + UUID.Random(); | 143 | string omCapUrl = "/CAPS/" + UUID.Random(); |
142 | 144 | ||
@@ -182,14 +184,14 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
182 | 184 | ||
183 | public void OnSceneObjectLoaded(SceneObjectGroup so) | 185 | public void OnSceneObjectLoaded(SceneObjectGroup so) |
184 | { | 186 | { |
185 | m_log.DebugFormat("[MOAP]: OnSceneObjectLoaded fired for {0} {1}", so.Name, so.UUID); | 187 | // m_log.DebugFormat("[MOAP]: OnSceneObjectLoaded fired for {0} {1}", so.Name, so.UUID); |
186 | 188 | ||
187 | so.ForEachPart(OnSceneObjectPartLoaded); | 189 | so.ForEachPart(OnSceneObjectPartLoaded); |
188 | } | 190 | } |
189 | 191 | ||
190 | public void OnSceneObjectPreSave(SceneObjectGroup persistingSo, SceneObjectGroup originalSo) | 192 | public void OnSceneObjectPreSave(SceneObjectGroup persistingSo, SceneObjectGroup originalSo) |
191 | { | 193 | { |
192 | m_log.DebugFormat("[MOAP]: OnSceneObjectPreSave fired for {0} {1}", persistingSo.Name, persistingSo.UUID); | 194 | // m_log.DebugFormat("[MOAP]: OnSceneObjectPreSave fired for {0} {1}", persistingSo.Name, persistingSo.UUID); |
193 | 195 | ||
194 | persistingSo.ForEachPart(OnSceneObjectPartPreSave); | 196 | persistingSo.ForEachPart(OnSceneObjectPartPreSave); |
195 | } | 197 | } |
@@ -318,7 +320,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
318 | protected string HandleObjectMediaMessage( | 320 | protected string HandleObjectMediaMessage( |
319 | string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 321 | string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
320 | { | 322 | { |
321 | m_log.DebugFormat("[MOAP]: Got ObjectMedia path [{0}], raw request [{1}]", path, request); | 323 | // m_log.DebugFormat("[MOAP]: Got ObjectMedia path [{0}], raw request [{1}]", path, request); |
322 | 324 | ||
323 | OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request); | 325 | OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request); |
324 | ObjectMediaMessage omm = new ObjectMediaMessage(); | 326 | ObjectMediaMessage omm = new ObjectMediaMessage(); |
@@ -348,9 +350,9 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
348 | 350 | ||
349 | if (null == part) | 351 | if (null == part) |
350 | { | 352 | { |
351 | m_log.WarnFormat( | 353 | // m_log.WarnFormat( |
352 | "[MOAP]: Received a GET ObjectMediaRequest for prim {0} but this doesn't exist in region {1}", | 354 | // "[MOAP]: Received a GET ObjectMediaRequest for prim {0} but this doesn't exist in region {1}", |
353 | primId, m_scene.RegionInfo.RegionName); | 355 | // primId, m_scene.RegionInfo.RegionName); |
354 | return string.Empty; | 356 | return string.Empty; |
355 | } | 357 | } |
356 | 358 | ||
@@ -365,7 +367,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
365 | 367 | ||
366 | string rawResp = OSDParser.SerializeLLSDXmlString(resp.Serialize()); | 368 | string rawResp = OSDParser.SerializeLLSDXmlString(resp.Serialize()); |
367 | 369 | ||
368 | m_log.DebugFormat("[MOAP]: Got HandleObjectMediaRequestGet raw response is [{0}]", rawResp); | 370 | // m_log.DebugFormat("[MOAP]: Got HandleObjectMediaRequestGet raw response is [{0}]", rawResp); |
369 | 371 | ||
370 | return rawResp; | 372 | return rawResp; |
371 | } | 373 | } |
@@ -384,13 +386,13 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
384 | 386 | ||
385 | if (null == part) | 387 | if (null == part) |
386 | { | 388 | { |
387 | m_log.WarnFormat( | 389 | // m_log.WarnFormat( |
388 | "[MOAP]: Received an UPDATE ObjectMediaRequest for prim {0} but this doesn't exist in region {1}", | 390 | // "[MOAP]: Received an UPDATE ObjectMediaRequest for prim {0} but this doesn't exist in region {1}", |
389 | primId, m_scene.RegionInfo.RegionName); | 391 | // primId, m_scene.RegionInfo.RegionName); |
390 | return string.Empty; | 392 | return string.Empty; |
391 | } | 393 | } |
392 | 394 | ||
393 | m_log.DebugFormat("[MOAP]: Received {0} media entries for prim {1}", omu.FaceMedia.Length, primId); | 395 | // m_log.DebugFormat("[MOAP]: Received {0} media entries for prim {1}", omu.FaceMedia.Length, primId); |
394 | 396 | ||
395 | // for (int i = 0; i < omu.FaceMedia.Length; i++) | 397 | // for (int i = 0; i < omu.FaceMedia.Length; i++) |
396 | // { | 398 | // { |
@@ -401,9 +403,9 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
401 | 403 | ||
402 | if (omu.FaceMedia.Length > part.GetNumberOfSides()) | 404 | if (omu.FaceMedia.Length > part.GetNumberOfSides()) |
403 | { | 405 | { |
404 | m_log.WarnFormat( | 406 | // m_log.WarnFormat( |
405 | "[MOAP]: Received {0} media entries from client for prim {1} {2} but this prim has only {3} faces. Dropping request.", | 407 | // "[MOAP]: Received {0} media entries from client for prim {1} {2} but this prim has only {3} faces. Dropping request.", |
406 | omu.FaceMedia.Length, part.Name, part.UUID, part.GetNumberOfSides()); | 408 | // omu.FaceMedia.Length, part.Name, part.UUID, part.GetNumberOfSides()); |
407 | return string.Empty; | 409 | return string.Empty; |
408 | } | 410 | } |
409 | 411 | ||
@@ -416,7 +418,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
416 | 418 | ||
417 | if (null == media) | 419 | if (null == media) |
418 | { | 420 | { |
419 | m_log.DebugFormat("[MOAP]: Setting all new media list for {0}", part.Name); | 421 | // m_log.DebugFormat("[MOAP]: Setting all new media list for {0}", part.Name); |
420 | part.Shape.Media = new List<MediaEntry>(omu.FaceMedia); | 422 | part.Shape.Media = new List<MediaEntry>(omu.FaceMedia); |
421 | 423 | ||
422 | for (int i = 0; i < omu.FaceMedia.Length; i++) | 424 | for (int i = 0; i < omu.FaceMedia.Length; i++) |
@@ -430,9 +432,9 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
430 | Primitive.TextureEntryFace face = te.CreateFace((uint)i); | 432 | Primitive.TextureEntryFace face = te.CreateFace((uint)i); |
431 | face.MediaFlags = true; | 433 | face.MediaFlags = true; |
432 | part.Shape.Textures = te; | 434 | part.Shape.Textures = te; |
433 | m_log.DebugFormat( | 435 | // m_log.DebugFormat( |
434 | "[MOAP]: Media flags for face {0} is {1}", | 436 | // "[MOAP]: Media flags for face {0} is {1}", |
435 | i, part.Shape.Textures.FaceTextures[i].MediaFlags); | 437 | // i, part.Shape.Textures.FaceTextures[i].MediaFlags); |
436 | } | 438 | } |
437 | } | 439 | } |
438 | } | 440 | } |
@@ -460,9 +462,9 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
460 | Primitive.TextureEntryFace face = te.CreateFace((uint)i); | 462 | Primitive.TextureEntryFace face = te.CreateFace((uint)i); |
461 | face.MediaFlags = true; | 463 | face.MediaFlags = true; |
462 | 464 | ||
463 | m_log.DebugFormat( | 465 | // m_log.DebugFormat( |
464 | "[MOAP]: Media flags for face {0} is {1}", | 466 | // "[MOAP]: Media flags for face {0} is {1}", |
465 | i, face.MediaFlags); | 467 | // i, face.MediaFlags); |
466 | // m_log.DebugFormat("[MOAP]: Set media entry for face {0} on {1}", i, part.Name); | 468 | // m_log.DebugFormat("[MOAP]: Set media entry for face {0} on {1}", i, part.Name); |
467 | } | 469 | } |
468 | } | 470 | } |
@@ -495,7 +497,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
495 | protected string HandleObjectMediaNavigateMessage( | 497 | protected string HandleObjectMediaNavigateMessage( |
496 | string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 498 | string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
497 | { | 499 | { |
498 | m_log.DebugFormat("[MOAP]: Got ObjectMediaNavigate request [{0}]", request); | 500 | // m_log.DebugFormat("[MOAP]: Got ObjectMediaNavigate request [{0}]", request); |
499 | 501 | ||
500 | OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request); | 502 | OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request); |
501 | ObjectMediaNavigateMessage omn = new ObjectMediaNavigateMessage(); | 503 | ObjectMediaNavigateMessage omn = new ObjectMediaNavigateMessage(); |
@@ -521,9 +523,9 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
521 | if (!m_scene.Permissions.CanInteractWithPrimMedia(agentId, part.UUID, omn.Face)) | 523 | if (!m_scene.Permissions.CanInteractWithPrimMedia(agentId, part.UUID, omn.Face)) |
522 | return string.Empty; | 524 | return string.Empty; |
523 | 525 | ||
524 | m_log.DebugFormat( | 526 | // m_log.DebugFormat( |
525 | "[MOAP]: Received request to update media entry for face {0} on prim {1} {2} to {3}", | 527 | // "[MOAP]: Received request to update media entry for face {0} on prim {1} {2} to {3}", |
526 | omn.Face, part.Name, part.UUID, omn.URL); | 528 | // omn.Face, part.Name, part.UUID, omn.URL); |
527 | 529 | ||
528 | // If media has never been set for this prim, then just return. | 530 | // If media has never been set for this prim, then just return. |
529 | if (null == part.Shape.Media) | 531 | if (null == part.Shape.Media) |
@@ -539,9 +541,9 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
539 | { | 541 | { |
540 | if (!CheckUrlAgainstWhitelist(omn.URL, me.WhiteList)) | 542 | if (!CheckUrlAgainstWhitelist(omn.URL, me.WhiteList)) |
541 | { | 543 | { |
542 | m_log.DebugFormat( | 544 | // m_log.DebugFormat( |
543 | "[MOAP]: Blocking change of face {0} on prim {1} {2} to {3} since it's not on the enabled whitelist", | 545 | // "[MOAP]: Blocking change of face {0} on prim {1} {2} to {3} since it's not on the enabled whitelist", |
544 | omn.Face, part.Name, part.UUID, omn.URL); | 546 | // omn.Face, part.Name, part.UUID, omn.URL); |
545 | 547 | ||
546 | return string.Empty; | 548 | return string.Empty; |
547 | } | 549 | } |
@@ -596,7 +598,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
596 | part.MediaUrl = string.Format("x-mv:{0:D10}/{1}", ++version, updateId); | 598 | part.MediaUrl = string.Format("x-mv:{0:D10}/{1}", ++version, updateId); |
597 | } | 599 | } |
598 | 600 | ||
599 | m_log.DebugFormat("[MOAP]: Storing media url [{0}] in prim {1} {2}", part.MediaUrl, part.Name, part.UUID); | 601 | // m_log.DebugFormat("[MOAP]: Storing media url [{0}] in prim {1} {2}", part.MediaUrl, part.Name, part.UUID); |
600 | } | 602 | } |
601 | 603 | ||
602 | /// <summary> | 604 | /// <summary> |
@@ -617,7 +619,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
617 | if (wlUrl.EndsWith("*")) | 619 | if (wlUrl.EndsWith("*")) |
618 | wlUrl = wlUrl.Remove(wlUrl.Length - 1); | 620 | wlUrl = wlUrl.Remove(wlUrl.Length - 1); |
619 | 621 | ||
620 | m_log.DebugFormat("[MOAP]: Checking whitelist URL pattern {0}", origWlUrl); | 622 | // m_log.DebugFormat("[MOAP]: Checking whitelist URL pattern {0}", origWlUrl); |
621 | 623 | ||
622 | // Handle a line starting wildcard slightly differently since this can only match the domain, not the path | 624 | // Handle a line starting wildcard slightly differently since this can only match the domain, not the path |
623 | if (wlUrl.StartsWith("*")) | 625 | if (wlUrl.StartsWith("*")) |
@@ -626,7 +628,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
626 | 628 | ||
627 | if (url.Host.Contains(wlUrl)) | 629 | if (url.Host.Contains(wlUrl)) |
628 | { | 630 | { |
629 | m_log.DebugFormat("[MOAP]: Whitelist URL {0} matches {1}", origWlUrl, rawUrl); | 631 | // m_log.DebugFormat("[MOAP]: Whitelist URL {0} matches {1}", origWlUrl, rawUrl); |
630 | return true; | 632 | return true; |
631 | } | 633 | } |
632 | } | 634 | } |
@@ -636,7 +638,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
636 | 638 | ||
637 | if (urlToMatch.StartsWith(wlUrl)) | 639 | if (urlToMatch.StartsWith(wlUrl)) |
638 | { | 640 | { |
639 | m_log.DebugFormat("[MOAP]: Whitelist URL {0} matches {1}", origWlUrl, rawUrl); | 641 | // m_log.DebugFormat("[MOAP]: Whitelist URL {0} matches {1}", origWlUrl, rawUrl); |
640 | return true; | 642 | return true; |
641 | } | 643 | } |
642 | } | 644 | } |