diff options
| author | Tess Chu <tess@lindenlab.com> | 2007-10-02 22:38:38 +0000 |
|---|---|---|
| committer | Tess Chu <tess@lindenlab.com> | 2007-10-02 22:38:38 +0000 |
| commit | cfd17f3322ec9c8efb120faa23adb83846272193 (patch) | |
| tree | eefbf2fefcac737d4050fba10e072fe951cd4381 /indra/newview/llviewermenu.cpp | |
| parent | 97631054272eeb83155f70fec6a869efc39079e5 (diff) | |
svn merge -r 70819:70853 svn+ssh://svn/svn/linden/branches/urldispatcher-for-merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index c242d855f1..adea8968e5 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -83,7 +83,6 @@ #include "llfloatergroups.h" #include "llfloaterhtml.h" #include "llfloaterhtmlhelp.h" -#include "llfloaterhtmlfind.h" #include "llfloaterinspect.h" #include "llfloaterlagmeter.h" #include "llfloaterland.h" @@ -340,6 +339,7 @@ void toggle_show_xui_names(void *); BOOL check_show_xui_names(void *); // Debug UI +void handle_slurl_test(void*); void handle_save_to_xml(void*); void handle_load_from_xml(void*); @@ -976,6 +976,7 @@ extern BOOL gVectorizePerfTest; void init_debug_ui_menu(LLMenuGL* menu) { + menu->append(new LLMenuItemCallGL("SLURL Test", &handle_slurl_test)); menu->append(new LLMenuItemCallGL("Editable UI", &edit_ui)); menu->append(new LLMenuItemToggleGL("Async Keystrokes", &gHandleKeysAsync)); menu->append(new LLMenuItemCallGL( "Dump SelectMgr", &dump_select_mgr)); @@ -7282,6 +7283,11 @@ void handle_load_from_xml(void*) } } +void handle_slurl_test(void*) +{ + LLFloaterHtml::getInstance()->show("http://user.lindenlab.com/~james/slurl.html", "SLURL Test"); +} + void handle_rebake_textures(void*) { LLVOAvatar* avatar = gAgent.getAvatarObject(); |