From cc8e7060dfb54900f1600965a78c6f6f9fc564c4 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 3 May 2011 18:09:28 -0700
Subject: Besides the numerous label and organizational changes, here are the
 main points

* Moved numerous options out of the Advanced panel
* Moved numerous options out of the General panel
* Combined the Network and Web Browser panels
* Combined IM, Chat, and Spell checking preferences
* Combined 'Show timestamps in IMs' and 'Show timestamps in Local Chat' to one ShowTimestamps setting
* Removed UI for 'hide my own group title'. This can still be set in the debug settings
* Renamed Popups > Notifications
* Renamed Chat Colors > Colors
* Renamed 'IMs and Logging' to 'Logging and Privacy'
* Moved Colors next to Skins
* Added style guide to the top of every preferences panel xui
---
 linden/indra/newview/llimpanel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/newview/llimpanel.cpp')

diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index a3e917f..5f6624b 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1618,7 +1618,7 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4
 	// Actually add the line
 	std::string timestring;
 	bool prepend_newline = true;
-	if (gSavedSettings.getBOOL("IMShowTimestamps"))
+	if (gSavedSettings.getBOOL("ShowTimestamps"))
 	{
 		timestring = mHistoryEditor->appendTime(prepend_newline);
 		prepend_newline = false;
-- 
cgit v1.1