summaryrefslogtreecommitdiff
path: root/indra/newview/lllogchat.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-06-23 17:39:04 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-06-23 17:39:04 -0400
commit887516ca4ca6db33a655ab67d15bac8f2e014db1 (patch)
tree0dd796b21b21544d376a7833ce27e815673906c0 /indra/newview/lllogchat.cpp
parentb0fdc4495153523ff417334499ca466b0d8987c8 (diff)
parentb343d25d19a7d21470027da379c7f16bc7fcb9fc (diff)
merge viewer-development to mesh-development
Diffstat (limited to 'indra/newview/lllogchat.cpp')
-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)
{