diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-26 07:32:22 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-26 07:32:22 -0400 |
| commit | 5d36b70aa60ccac6e680bbe88df3cc6c0a57fdb2 (patch) | |
| tree | 88346596839aa51bd4363e3e5c87e4166ecce5a2 /indra/newview/lllogchat.cpp | |
| parent | dda139f476b6a457f7f9558c1dc82b009d4ba7a6 (diff) | |
| parent | ca89422fb37213ec5f456f9d91396238e24d1316 (diff) | |
merge changes for latest viewer-development
Diffstat (limited to 'indra/newview/lllogchat.cpp')
| -rw-r--r-- | indra/newview/lllogchat.cpp | 2 |
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) { |