diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
| commit | d60f16540dba5616cd8260046b44ebc2a1047065 (patch) | |
| tree | ab241efaf58ba4eeb1916763cef337a04bc15d64 /indra/newview/llurlwhitelist.cpp | |
| parent | 0434d35c160bcd0d78b8f4e795a62155f50a6fb8 (diff) | |
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431
This turned up the following "lost" changes:
llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly
llfontgl.cpp (from maintenance r50207) - whitespace only
inventorybridge.cpp (property - non-executable)
skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
Diffstat (limited to 'indra/newview/llurlwhitelist.cpp')
| -rw-r--r-- | indra/newview/llurlwhitelist.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/indra/newview/llurlwhitelist.cpp b/indra/newview/llurlwhitelist.cpp index d582d2d19f..65f7229abf 100644 --- a/indra/newview/llurlwhitelist.cpp +++ b/indra/newview/llurlwhitelist.cpp @@ -200,22 +200,4 @@ bool LLUrlWhiteList::getNext ( LLString& valueOut ) bool LLUrlWhiteList::containsMatch ( const LLString& patternIn ) { return false; - - // CP: removed since they're not useful without Mozilla enabled - #if LL_MOZILLA_ENABLED - LLString pattern = url_cleanup(patternIn); - - if (pattern.empty()) return false; - - LLStringListIter iter = std::find ( mUrlList.begin (), mUrlList.end (), pattern ); - - if ( iter != mUrlList.end () ) - { - return true; - } - else - { - return false; - }; - #endif } |