diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-17 11:51:04 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-17 11:51:04 +0000 |
| commit | 8331c1a83776abcfeeec4629d9dfbdd2c689d14f (patch) | |
| tree | 1654d69e483252c9c4d12e1012800de4740510e2 /indra/newview/llviewermenu.cpp | |
| parent | 59e4b000a3ed41a3c83ae99501adc3eccf64367e (diff) | |
| parent | 5cae8140f4dfbdd9c4b3237a0d47248753180913 (diff) | |
PE merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 1d58daba2c..5c40d02f8d 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -86,6 +86,7 @@ #include "lltoolmgr.h" #include "lltoolpie.h" #include "lltoolselectland.h" +#include "lltrans.h" #include "llviewergenericmessage.h" #include "llviewerhelp.h" #include "llviewermenufile.h" // init_menu_file() @@ -7047,7 +7048,7 @@ LLVOAvatar* find_avatar_from_object( const LLUUID& object_id ) void handle_disconnect_viewer(void *) { - LLAppViewer::instance()->forceDisconnect("Testing viewer disconnect"); + LLAppViewer::instance()->forceDisconnect(LLTrans::getString("TestingDisconnect")); } void force_error_breakpoint(void *) |