diff options
author | callum <none@none> | 2010-12-02 18:46:26 -0800 |
---|---|---|
committer | callum <none@none> | 2010-12-02 18:46:26 -0800 |
commit | 84a50386be1ef34100e153666389ffacf03e8e8b (patch) | |
tree | cc306f7c9d698ec642d86b3763e4de0ae89eb94d /indra/newview/llweb.cpp | |
parent | edc644c3933b78dffe81de4ca4362fcf603e7e2e (diff) |
SOCIAL-317 FIX LLWebContentFloater opens popups in the media browser
Diffstat (limited to 'indra/newview/llweb.cpp')
-rw-r--r-- | indra/newview/llweb.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp index 91a713be56..2ecab2cbdf 100644 --- a/indra/newview/llweb.cpp +++ b/indra/newview/llweb.cpp @@ -96,6 +96,23 @@ void LLWeb::loadURL(const std::string& url, const std::string& target, const std } } +// static +void LLWeb::loadWebURL(const std::string& url, const std::string& target, const std::string& uuid) +{ + if(target == "_internal") + { + // Force load in the internal browser, as if with a blank target. + loadWebURLInternal(url, "", uuid); + } + else if (gSavedSettings.getBOOL("UseExternalBrowser") || (target == "_external")) + { + loadURLExternal(url); + } + else + { + loadWebURLInternal(url, target, uuid); + } +} // static void LLWeb::loadURLInternal(const std::string &url, const std::string& target, const std::string& uuid) |