diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-18 10:19:18 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-18 10:19:18 -0400 |
| commit | c86f61fd313a9f64dd0f1c5d100f39d6a3cb8eb0 (patch) | |
| tree | bd2064d723a9596b45ce2df3c33f0556cf01a681 /indra/newview/llviewermenu.cpp | |
| parent | 896b88063ed0e08362c9e277e7ef8aba5afef0db (diff) | |
| parent | a3a4235a8904cf4d6e565c82d5d90d8a64c15180 (diff) | |
automated merge viewer2.0->viewer2.0
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 *) |