diff options
| author | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 20:48:38 +0000 |
|---|---|---|
| committer | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 20:48:38 +0000 |
| commit | d273ba2ce2707c6a2fe45c08fdc2524aae19ad00 (patch) | |
| tree | 56b3723fed44031e888de9019b1ad127acdb1806 /indra/newview/llstartup.cpp | |
| parent | e1e1212daae33723e7da325f295a5c3a6bb78979 (diff) | |
Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 4844f2d81e..7d9bab59df 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -174,11 +174,6 @@ #include "llpostprocess.h" #include "llwlparammanager.h" #include "llwaterparammanager.h" -#include "llagentlanguage.h" - -#if LL_LIBXUL_ENABLED -#include "llmozlib.h" -#endif // LL_LIBXUL_ENABLED #if LL_WINDOWS #include "llwindebug.h" @@ -474,7 +469,7 @@ BOOL idle_startup() } else { - LLAppViewer::instance()->earlyExit("Message Template " + message_template_path + " not found."); + LLAppViewer::instance()->earlyExit("Unable to initialize communications."); } if(gMessageSystem && gMessageSystem->isOK()) @@ -2152,10 +2147,6 @@ BOOL idle_startup() // JC - 7/20/2002 gViewerWindow->sendShapeToSim(); - // Inform simulator of our language preference - LLAgentLanguage::update(); - - // Ignore stipend information for now. Money history is on the web site. // if needed, show the L$ history window //if (stipend_since_login && !gNoRender) |