diff options
author | Justin Clark-Casey (justincc) | 2010-07-15 21:14:55 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-07-26 23:34:21 +0100 |
commit | 0edabffb7d6213db041ba3d01fee157dabcbcda5 (patch) | |
tree | df230ba37ba37314712835c7f9d10ba1e194d3e1 /OpenSim/Region/CoreModules/World | |
parent | properly expose prim media LSL functions to scripts (diff) | |
download | opensim-SC_OLD-0edabffb7d6213db041ba3d01fee157dabcbcda5.zip opensim-SC_OLD-0edabffb7d6213db041ba3d01fee157dabcbcda5.tar.gz opensim-SC_OLD-0edabffb7d6213db041ba3d01fee157dabcbcda5.tar.bz2 opensim-SC_OLD-0edabffb7d6213db041ba3d01fee157dabcbcda5.tar.xz |
Implement * end wildcard for whitelist urls
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs index 4bbac6e..c24e6d5 100644 --- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs +++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs | |||
@@ -460,6 +460,10 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
460 | { | 460 | { |
461 | string wlUrl = rawWlUrl; | 461 | string wlUrl = rawWlUrl; |
462 | 462 | ||
463 | // Deal with a line-ending wildcard | ||
464 | if (wlUrl.EndsWith("*")) | ||
465 | wlUrl = wlUrl.Remove(wlUrl.Length - 1); | ||
466 | |||
463 | if (!wlUrl.StartsWith("http://")) | 467 | if (!wlUrl.StartsWith("http://")) |
464 | wlUrl = "http://" + wlUrl; | 468 | wlUrl = "http://" + wlUrl; |
465 | 469 | ||
@@ -467,7 +471,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
467 | 471 | ||
468 | if (url.StartsWith(wlUrl)) | 472 | if (url.StartsWith(wlUrl)) |
469 | { | 473 | { |
470 | m_log.DebugFormat("[MOAP]: Whitelist url {0} matches requested url {1}", wlUrl, url); | 474 | m_log.DebugFormat("[MOAP]: Whitelist URL {0} matches {1}", wlUrl, url); |
471 | return true; | 475 | return true; |
472 | } | 476 | } |
473 | } | 477 | } |