diff options
| author | callum <none@none> | 2010-12-03 15:36:08 -0800 |
|---|---|---|
| committer | callum <none@none> | 2010-12-03 15:36:08 -0800 |
| commit | 91fba2bd67d144fe4eedb7143a46e9edee12f5c6 (patch) | |
| tree | c1b74618a7059fee8bca5a2ab94d74042edcce4b /indra/newview | |
| parent | 9dd837f6bb7686213bd204131fb3368e63a55f5e (diff) | |
| parent | fd8b7b198edf142bd544e47f82328e194f05a6a1 (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llweb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llweb.h b/indra/newview/llweb.h index a74d4b6364..dc5958e57f 100644 --- a/indra/newview/llweb.h +++ b/indra/newview/llweb.h @@ -58,7 +58,7 @@ public: static void loadURLExternal(const std::string& url, bool async, const std::string& uuid = LLStringUtil::null); // Explicitly open a Web URL using the Web content floater vs. the more general media browser - static void LLWeb::loadWebURL(const std::string& url, const std::string& target, const std::string& uuid); + static void loadWebURL(const std::string& url, const std::string& target, const std::string& uuid); static void loadWebURLInternal(const std::string &url, const std::string& target, const std::string& uuid); static void loadWebURLInternal(const std::string &url) { loadWebURLInternal(url, LLStringUtil::null, LLStringUtil::null); } |