1 files changed, 9 insertions, 2 deletions

diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index fdf8bcf..004d063 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -57,6 +57,7 @@
 #include "llimagegl.h"
 #include "llwindow.h"
 #include "lltextparser.h"
+#include "lldir.h"
 #include <queue>
 
 #include "llmenugl.h"
@@ -4205,7 +4206,10 @@ void LLTextEditor::appendColoredText(const std::string &new_text,
                                                                          const std::string& font_name)
 {
         LLColor4 lcolor=color;
-        if (mParseHighlights)
+        // If LindenUserDir is empty then we didn't login yet.
+        // In that case we can't instantiate LLTextParser, which
+        // is initialized per user.
+        if (mParseHighlights && !gDirUtilp->getLindenUserDir(true).empty())
         {
                 LLTextParser* highlight = LLTextParser::getInstance();
                 highlight->parseFullLineHighlights(new_text, &lcolor);
@@ -4285,7 +4289,10 @@ void LLTextEditor::appendHighlightedText(const std::string &new_text,
                                                                                  S32  highlight_part,
                                                                                  LLStyleSP stylep)
 {
-        if (mParseHighlights) 
+        // If LindenUserDir is empty then we didn't login yet.
+        // In that case we can't instantiate LLTextParser, which
+        // is initialized per user.
+        if (mParseHighlights && !gDirUtilp->getLindenUserDir(true).empty())
         {
                 LLTextParser* highlight = LLTextParser::getInstance();