summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorSquire <squire@lindenlab.com>2011-06-20 11:18:26 -0700
committerSquire <squire@lindenlab.com>2011-06-20 11:18:26 -0700
commitaa15185bc858c14d2cdc402b0ed74293c2c3e693 (patch)
tree67624b059d45c9f5870abc6761c0fd5247a43cc6 /indra/newview
parent7f6d49df43c660b9f5632ffb8a30f90ee718cac0 (diff)
parent306759835d8aed3a041a59dafaa20a8c708e2dd4 (diff)
Chop-662 - fixes to deal with cleanly moving between the glob and regex world
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lllogchat.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index efc4e23838..ebb5912ace 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -230,7 +230,7 @@ std::string LLLogChat::makeLogFileName(std::string filename)
std::string LLLogChat::cleanFileName(std::string filename)
{
- std::string invalidChars = "\"\'\\/?*:.<>|";
+ std::string invalidChars = "\"\'\\/?*:.<>|[]{}~"; // Cannot match glob or illegal filename chars
std::string::size_type position = filename.find_first_of(invalidChars);
while (position != filename.npos)
{