summaryrefslogtreecommitdiff
path: root/indra/newview/lllogchat.cpp
diff options
context:
space:
mode:
authorSquire <squire@lindenlab.com>2011-06-28 11:25:42 -0700
committerSquire <squire@lindenlab.com>2011-06-28 11:25:42 -0700
commita67627777df3408ed8a5da14a8a5683e7e673a5e (patch)
tree74ca0f995a2d49d6b7b0505628097708861eb553 /indra/newview/lllogchat.cpp
parentfae829c8eface8cf356b63cbb82587d6950bdd79 (diff)
parent5c9fc7d24f0d060bcb86ed5b03cb9ba9c7282038 (diff)
STORM-1372, STORM-1439
Merged in: alain_linden/viewer-development lindenlab/viewer-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)
{