logging cleanup in support of debugging text editor problems

4 files changed, 27 insertions, 13 deletions

diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index 82b50f43ab..a3e033d894 100755
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -169,8 +169,7 @@ std::string LLKeywords::getArguments(LLSD& arguments)
 			}
 			else
 			{
-				LL_WARNS("SyntaxLSL")
-						<< "Argument array comtains a non-map element!" << LL_ENDL;
+				LL_WARNS("SyntaxLSL") << "Argument array comtains a non-map element!" << LL_ENDL;
 			}
 		}
 	}
@@ -265,11 +264,16 @@ LLColor4 LLKeywords::getColorGroup(const std::string key_in)
 void LLKeywords::initialise(LLSD SyntaxXML)
 {
 	mSyntax = SyntaxXML;
-	mLoaded = TRUE;
+	mLoaded = true;
 }
 
 void LLKeywords::processTokens()
 {
+	if (!mLoaded)
+	{
+		return;
+	}
+
 	// Add 'standard' stuff: Quotes, Comments, Strings, Labels, etc. before processing the LLSD
 	std::string delimiter;
 	addToken(LLKeywordToken::TT_LABEL, "@", getColorGroup("misc-flow-label"), "Label\nTarget for jump statement", delimiter );
@@ -282,7 +286,7 @@ void LLKeywords::processTokens()
 	{
 		if (outerIt->first == "llsd-lsl-syntax-version")
 		{
-			LL_INFOS("SyntaxLSL") << "Skipping over version key." << LL_ENDL;
+			// Skip over version key.
 		}
 		else
 		{
@@ -361,7 +365,7 @@ void LLKeywords::processTokensGroup(LLSD& Tokens, const std::string Group)
 					}
 					else
 					{
-						LL_WARNS("SyntaxLSL") << "Not a valid attribute" << LL_ENDL;
+						LL_WARNS("SyntaxLSL") << "Not a valid attribute: " << innerIt->first << LL_ENDL;
 					}
 				}
 
@@ -408,7 +412,7 @@ void LLKeywords::processTokensGroup(LLSD& Tokens, const std::string Group)
 	}
 	else if (Tokens.isArray())	// Currently nothing should need this, but it's here for completeness
 	{
-		LL_WARNS("SyntaxLSL") << "Curious, shouldn't be an array here; adding all using color " << Color << LL_ENDL;
+		LL_INFOS("SyntaxLSL") << "Curious, shouldn't be an array here; adding all using color " << Color << LL_ENDL;
 		for (int count = 0; count < Tokens.size(); ++count)
 		{
 			addToken(token_type, Tokens[count], Color, "");
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index c4664d6fe0..ee16d3de7c 100755
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -923,6 +923,7 @@ void LLTextBase::createDefaultSegment()
 	// ensures that there is always at least one segment
 	if (mSegments.empty())
 	{
+		
 		LLStyleConstSP sp(new LLStyle(getStyleParams()));
 		LLTextSegmentPtr default_segment = new LLNormalTextSegment( sp, 0, getLength() + 1, *this);
 		mSegments.insert(default_segment);
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index e3c89f1a5f..e4de00b9e5 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3364,6 +3364,10 @@ LLSD LLAppViewer::getViewerInfo() const
 		{
 			info["SERVER_RELEASE_NOTES_URL"] = LLTrans::getString("RetrievingData");
 		}
+		else
+		{
+			info["SERVER_RELEASE_NOTES_URL"] = LLTrans::getString("NotConnected");
+		}
 	}
 	else if (LLStringUtil::startsWith(mServerReleaseNotesURL, "http")) // it's an URL
 	{
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index 4331a63346..27ca9ab56a 100755
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -149,7 +149,8 @@ BOOL LLFloaterAbout::postBuild()
 	}
 	else // not logged in
 	{
-		setSupportText(LLStringUtil::null);
+		LL_DEBUGS("ViewerInfo") << "cannot display region info when not connected" << LL_ENDL;
+		setSupportText(LLTrans::getString("NotConnected"));
 	}
 
 	support_widget->blockUndo();
@@ -268,11 +269,15 @@ void LLFloaterAbout::setSupportText(const std::string& server_release_notes_url)
 	LLViewerTextEditor *support_widget =
 		getChild<LLViewerTextEditor>("support_editor", true);
 
+	LLUIColor about_color = LLUIColorTable::instance().getColor("TextFgReadOnlyColor");
+#   if 0
 	support_widget->clear();
 	support_widget->appendText(LLAppViewer::instance()->getViewerInfoString(),
-								FALSE,
-								LLStyle::Params()
-									.color(LLUIColorTable::instance().getColor("TextFgReadOnlyColor")));
+							   FALSE, LLStyle::Params() .color(about_color));
+#   else
+	support_widget->setText(LLAppViewer::instance()->getViewerInfoString(),
+							LLStyle::Params() .color(about_color));
+#   endif
 }
 
 ///----------------------------------------------------------------------------
@@ -306,9 +311,9 @@ void LLServerReleaseNotesURLFetcher::startFetch()
 // virtual
 void LLServerReleaseNotesURLFetcher::completedHeader(U32 status, const std::string& reason, const LLSD& content)
 {
-	lldebugs << "Status: " << status << llendl;
-	lldebugs << "Reason: " << reason << llendl;
-	lldebugs << "Headers: " << content << llendl;
+	LL_DEBUGS("VersionInfo") << "Status: " << status
+							 << "Reason: " << reason
+							 << "Headers: " << content << LL_ENDL;
 
 	LLFloaterAbout* floater_about = LLFloaterReg::getTypedInstance<LLFloaterAbout>("sl_about");
 	if (floater_about)