diff options
| author | Callum Prentice <callum@gmail.com> | 2017-06-08 15:36:42 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-06-08 15:36:42 -0700 |
| commit | 07185d300d7879fc4d8d268210fa2c440efe02f4 (patch) | |
| tree | 761fcb3e968339bc04882ea591f56af2fb175187 /indra/llcommon/lluri.cpp | |
| parent | 8d36da00c885f31739ce6bf6dbc162a6ef3a15a1 (diff) | |
| parent | cf5865c6e2b27918b526431ccc4309bfc702534e (diff) | |
Automated merge with head of lindenlab/viewer64
Diffstat (limited to 'indra/llcommon/lluri.cpp')
| -rw-r--r-- | indra/llcommon/lluri.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llcommon/lluri.cpp b/indra/llcommon/lluri.cpp index 9f12d49244..758b98e143 100644 --- a/indra/llcommon/lluri.cpp +++ b/indra/llcommon/lluri.cpp @@ -40,7 +40,8 @@ #include <boost/algorithm/string/find_iterator.hpp> #include <boost/algorithm/string/finder.hpp> -void encode_character(std::ostream& ostr, std::string::value_type val) +// static +void LLURI::encodeCharacter(std::ostream& ostr, std::string::value_type val) { ostr << "%" @@ -95,7 +96,7 @@ std::string LLURI::escape( } else { - encode_character(ostr, c); + encodeCharacter(ostr, c); } } } @@ -106,7 +107,7 @@ std::string LLURI::escape( c = *it; if(allowed.find(c) == std::string::npos) { - encode_character(ostr, c); + encodeCharacter(ostr, c); } else { |