Merge branch 'sl-base-1.22' into next

Conflicts:
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml

1 files changed, 24 insertions, 1 deletions

diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index 8cd2b5c..1dc00dd 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -497,6 +497,29 @@ std::string LLDir::getTempFilename() const
         return temp_filename;
 }
 
+// static
+std::string LLDir::getScrubbedFileName(const std::string uncleanFileName)
+{
+        std::string name(uncleanFileName);
+        const std::string illegalChars(getForbiddenFileChars());
+        // replace any illegal file chars with and underscore '_'
+        for( unsigned int i = 0; i < illegalChars.length(); i++ )
+        {
+                int j = -1;
+                while((j = name.find(illegalChars[i])) > -1)
+                {
+                        name[j] = '_';
+                }
+        }
+        return name;
+}
+
+// static
+std::string LLDir::getForbiddenFileChars()
+{
+        return "\\/:*?\"<>|";
+}
+
 void LLDir::setLindenUserDir(const std::string &first, const std::string &last)
 {
         // if both first and last aren't set, assume we're grabbing the cached dir