diff options
| author | simon@lindenlab.com <simon@lindenlab.com> | 2011-06-27 10:15:24 -0700 |
|---|---|---|
| committer | simon@lindenlab.com <simon@lindenlab.com> | 2011-06-27 10:15:24 -0700 |
| commit | d40bd76ec76bf7d2fa59d15f5c71125c9813f31e (patch) | |
| tree | 5e47be32903db5e8ff5520bd7ec46aad2f43adad /indra/newview/lllogchat.cpp | |
| parent | 398019ffb2a036813c6c89a677e9534faa178330 (diff) | |
| parent | 5c9fc7d24f0d060bcb86ed5b03cb9ba9c7282038 (diff) | |
Merge viewer 2.7.6 from trunk
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) { |