diff options
| author | Don Kjer <don@lindenlab.com> | 2010-12-22 14:24:28 -0800 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2010-12-22 14:24:28 -0800 |
| commit | 0f5d8e53cad9afe4f5601c6a6cdd82ec474935e5 (patch) | |
| tree | 25333fe8d8ba1c19b176d7feade03ccecfdd5829 /indra/newview/llviewermenu.cpp | |
| parent | 649dd6eb74023d48379ebaadd2ff000801306f17 (diff) | |
| parent | c86d6a7bbb7c0db7665b76cf52b12b90c6e98c6d (diff) | |
Merge with viewer-development
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index ee37594d9d..3a37f0355f 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7227,6 +7227,12 @@ void handle_web_browser_test(const LLSD& param) LLWeb::loadURLInternal(url); } +void handle_web_content_test(const LLSD& param) +{ + std::string url = param.asString(); + LLWeb::loadWebURLInternal(url); +} + void handle_buy_currency_test(void*) { std::string url = @@ -7977,7 +7983,8 @@ void initialize_menus() view_listener_t::addMenu(new LLAdvancedDumpRegionObjectCache(), "Advanced.DumpRegionObjectCache"); // Advanced > UI - commit.add("Advanced.WebBrowserTest", boost::bind(&handle_web_browser_test, _2)); + commit.add("Advanced.WebBrowserTest", boost::bind(&handle_web_browser_test, _2)); // sigh! this one opens the MEDIA browser + commit.add("Advanced.WebContentTest", boost::bind(&handle_web_content_test, _2)); // this one opens the Web Content floater view_listener_t::addMenu(new LLAdvancedBuyCurrencyTest(), "Advanced.BuyCurrencyTest"); view_listener_t::addMenu(new LLAdvancedDumpSelectMgr(), "Advanced.DumpSelectMgr"); view_listener_t::addMenu(new LLAdvancedDumpInventory(), "Advanced.DumpInventory"); |