Merge remote branch 'mccabe/1.3.0-next' into next

Conflicts:
	linden/indra/cmake/00-Common.cmake
	linden/indra/newview/skins/default/xui/de/floater_about.xml
	linden/indra/newview/skins/default/xui/fr/floater_about.xml
	linden/indra/newview/skins/default/xui/ja/floater_about.xml
	linden/indra/newview/skins/default/xui/ko/floater_about.xml
	linden/indra/newview/skins/default/xui/zh/floater_about.xml
	linden/install.xml

1 files changed, 31 insertions, 24 deletions

diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index 93bd89a..7db62bc 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -32,16 +33,28 @@
 #ifndef LL_LLSTRING_H
 #define LL_LLSTRING_H
 
+#include <string>
+
 #if LL_LINUX || LL_SOLARIS
 #include <wctype.h>
 #include <wchar.h>
 #endif
 #include "linden_common.h"
 
+#include <string.h>
+
+#if LL_SOLARIS
+// stricmp and strnicmp do not exist on Solaris:
+#define stricmp strcasecmp
+#define strnicmp strncasecmp
+#endif
+
 const char LL_UNKNOWN_CHAR = '?';
 
 #if LL_DARWIN || LL_LINUX || LL_SOLARIS
 // Template specialization of char_traits for U16s. Only necessary on Mac and Linux (exists on Windows already)
+#include <cstring>
+
 namespace std
 {
 template<>
@@ -487,48 +500,29 @@ namespace LLStringFn
         /**
          * @brief Replace all non-printable characters with replacement in
          * string.
+         * NOTE - this will zap non-ascii
          *
          * @param [in,out] string the to modify. out value is the string
          * with zero non-printable characters.
          * @param The replacement character. use LL_UNKNOWN_CHAR if unsure.
          */
-        void replace_nonprintable(
+        void replace_nonprintable_in_ascii(
                 std::basic_string<char>& string,
                 char replacement);
 
-        /**
-         * @brief Replace all non-printable characters with replacement in
-         * a wide string.
-         *
-         * @param [in,out] string the to modify. out value is the string
-         * with zero non-printable characters.
-         * @param The replacement character. use LL_UNKNOWN_CHAR if unsure.
-         */
-        void replace_nonprintable(
-                std::basic_string<llwchar>& string,
-                llwchar replacement);
 
         /**
          * @brief Replace all non-printable characters and pipe characters
          * with replacement in a string.
+         * NOTE - this will zap non-ascii
          *
          * @param [in,out] the string to modify. out value is the string
          * with zero non-printable characters and zero pipe characters.
          * @param The replacement character. use LL_UNKNOWN_CHAR if unsure.
          */
-        void replace_nonprintable_and_pipe(std::basic_string<char>& str,
+        void replace_nonprintable_and_pipe_in_ascii(std::basic_string<char>& str,
                                                                            char replacement);
 
-        /**
-         * @brief Replace all non-printable characters and pipe characters
-         * with replacement in a wide string.
-         *
-         * @param [in,out] the string to modify. out value is the string
-         * with zero non-printable characters and zero pipe characters.
-         * @param The replacement wide character. use LL_UNKNOWN_CHAR if unsure.
-         */
-        void replace_nonprintable_and_pipe(std::basic_string<llwchar>& str,
-                                                                           llwchar replacement);
 
         /**
          * @brief Remove all characters that are not allowed in XML 1.0.
@@ -536,6 +530,19 @@ namespace LLStringFn
          * Works with US ASCII and UTF-8 encoded strings.  JC
          */
         std::string strip_invalid_xml(const std::string& input);
+
+
+        /**
+         * @brief Replace all control characters (0 <= c < 0x20) with replacement in
+         * string.   This is safe for utf-8
+         *
+         * @param [in,out] string the to modify. out value is the string
+         * with zero non-printable characters.
+         * @param The replacement character. use LL_UNKNOWN_CHAR if unsure.
+         */
+        void replace_ascii_controlchars(
+                std::basic_string<char>& string,
+                char replacement);
 }
 
 ////////////////////////////////////////////////////////////