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/llweb.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/llweb.cpp')
| -rw-r--r-- | indra/newview/llweb.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp index d57bb7da82..1f87cf225d 100644 --- a/indra/newview/llweb.cpp +++ b/indra/newview/llweb.cpp @@ -19,18 +19,7 @@ // static void LLWeb::loadURL(std::string url) { -#if LL_MOZILLA_ENABLED - if (gSavedSettings.getBOOL("UseExternalBrowser")) - { - loadURLExternal(url); - } - else - { - LLFloaterHTML::show((void*)url.c_str()); - } -#else loadURLExternal(url); -#endif } |