summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index d931e84638..c493e8f049 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -174,6 +174,11 @@
#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"
@@ -469,7 +474,7 @@ BOOL idle_startup()
}
else
{
- LLAppViewer::instance()->earlyExit("Unable to initialize communications.");
+ LLAppViewer::instance()->earlyExit("Message Template " + message_template_path + " not found.");
}
if(gMessageSystem && gMessageSystem->isOK())
@@ -2147,6 +2152,10 @@ 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)