diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-14 14:47:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-14 14:47:15 -0400 |
| commit | 54bb91fd03d0c2f2600993274c59ae89324eeb03 (patch) | |
| tree | 395686190c716ecf9a123610797838ed8b67222e /indra/newview/lllogchat.cpp | |
| parent | dc0765fc3d04bcab9a89bdc8d703f74f09796119 (diff) | |
| parent | b48b8ed6484966d33bbe36c31ffc050b7314606a (diff) | |
merge changes for 2.7.5 release
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) { |