From d60f16540dba5616cd8260046b44ebc2a1047065 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 4 Jan 2007 02:04:29 +0000 Subject: 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 --- indra/newview/llweb.cpp | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'indra/newview/llweb.cpp') 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 } -- cgit v1.2.3