Backported fix for VWR-5529: group chat scrolls up when logging enabled

mccabe · Jan 24, 2009 · 05f5b3c · 05f5b3c
1 parent 0cd8fbf
commit 05f5b3c
Show file tree

Hide file tree

Showing 8 changed files with 191 additions and 156 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -7,6 +7,21 @@
 	* linden/indra/llui/lltexteditor.cpp:
 	Backported Qarl's fix for VWR-8773: Closing parenthesis breaks urls. 
 
+	* linden/indra/llcommon/llstring.h:
+	Backported fix for VWR-5529: group chat scrolls up when logging enabled.
+	* linden/indra/llui/lltexteditor.cpp:
+	Ditto.
+	* linden/indra/llui/lltexteditor.h:
+	Ditto.
+	* linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml:
+	Ditto.
+	* linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml:
+	Ditto.
+	* linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml:
+	Ditto.
+	* linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml:
+	Ditto.
+
 
 2009-01-22  McCabe Maxsted  <hakushakukun@gmail.com>
 

diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
@@ -133,26 +133,32 @@ struct char_traits<U16>
 class LLStringOps
 {
 public:
-	static char toUpper(char elem) { return toupper(elem); }
+	static char toUpper(char elem) { return toupper((unsigned char)elem); }
 	static llwchar toUpper(llwchar elem) { return towupper(elem); }
 
-	static char toLower(char elem) { return tolower(elem); }
+	static char toLower(char elem) { return tolower((unsigned char)elem); }
 	static llwchar toLower(llwchar elem) { return towlower(elem); }
 
-	static BOOL isSpace(char elem) { return isspace(elem) != 0; }
-	static BOOL isSpace(llwchar elem) { return iswspace(elem) != 0; }
+	static bool isSpace(char elem) { return isspace((unsigned char)elem) != 0; }
+	static bool isSpace(llwchar elem) { return iswspace(elem) != 0; }
 
-	static BOOL isUpper(char elem) { return isupper(elem) != 0; }
-	static BOOL isUpper(llwchar elem) { return iswupper(elem) != 0; }
+	static bool isUpper(char elem) { return isupper((unsigned char)elem) != 0; }
+	static bool isUpper(llwchar elem) { return iswupper(elem) != 0; }
 
-	static BOOL isLower(char elem) { return islower(elem) != 0; }
-	static BOOL isLower(llwchar elem) { return iswlower(elem) != 0; }
+	static bool isLower(char elem) { return islower((unsigned char)elem) != 0; }
+	static bool isLower(llwchar elem) { return iswlower(elem) != 0; }
+
+	static bool isDigit(char a) { return isdigit((unsigned char)a) != 0; }
+	static bool isDigit(llwchar a) { return iswdigit(a) != 0; }
+
+	static bool isPunct(char a) { return ispunct((unsigned char)a) != 0; }
+	static bool isPunct(llwchar a) { return iswpunct(a) != 0; }
+
+	static bool isAlnum(char a) { return isalnum((unsigned char)a) != 0; }
+	static bool isAlnum(llwchar a) { return iswalnum(a) != 0; }
 
 	static S32	collate(const char* a, const char* b) { return strcoll(a, b); }
 	static S32	collate(const llwchar* a, const llwchar* b);
-
-	static BOOL isDigit(char a) { return isdigit(a) != 0; }
-	static BOOL isDigit(llwchar a) { return iswdigit(a) != 0; }
 };
 
 /**
@@ -194,7 +200,7 @@ class LLStringUtilBase
 	typedef std::map<LLFormatMapString, LLFormatMapString> format_map_t;
 	static S32 format(std::basic_string<T>& s, const format_map_t& fmt_map);
 
-	static BOOL	isValidIndex(const std::basic_string<T>& string, size_type i)
+	static bool isValidIndex(const std::basic_string<T>& string, size_type i)
 	{
 		return !string.empty() && (0 <= i) && (i <= string.size());
 	}