diff options
| author | Robert Knop <prospero@lindenlab.com> | 2009-01-19 20:40:59 +0000 |
|---|---|---|
| committer | Robert Knop <prospero@lindenlab.com> | 2009-01-19 20:40:59 +0000 |
| commit | f1380f2fc3eecd8dfd2f75d053ff86716d5055f7 (patch) | |
| tree | 842470a9ff4341d09e1f7f9210aae0f6499fb4b1 /indra/llinventory | |
| parent | 15a6d273cc00e1f4f9f9d56d8c878b46b283b289 (diff) | |
Merging from the server/server-1.25 branch
svn merge -r107352:108210
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
Merge conflicts were resolved:
scripts/start-server : one conflict, kept the "working" version
indra/llcommon/llversionserver.h : reverted
indra/newview/Info-SecondLife.plist : reverted
indra/newview/res/viewerRes.rc : reverted
indra/newsim/llagentinfo.cpp : kept *both*... "working" had
is_agent_online, which nothing else had, and the merge had
isGodAllowed(), part of SEC resolution
indra/backbone/agent_router.py : kartic & rdw merged and reviewed
using brains and things
indra/newsim/llsimhttpresponder.cpp : doesn't exist in trunk, and
that's OK (even though there was a change for it)
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llparcel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index bbf3f4af3b..6fa5c9076e 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -278,7 +278,7 @@ void LLParcel::setName(const std::string& name) // The escaping here must match the escaping in the database // abstraction layer. mName = name; - LLStringFn::replace_nonprintable(mName, LL_UNKNOWN_CHAR); + LLStringFn::replace_nonprintable_in_ascii(mName, LL_UNKNOWN_CHAR); } void LLParcel::setDesc(const std::string& desc) @@ -296,7 +296,7 @@ void LLParcel::setMusicURL(const std::string& url) // abstraction layer. // This should really filter the url in some way. Other than // simply requiring non-printable. - LLStringFn::replace_nonprintable(mMusicURL, LL_UNKNOWN_CHAR); + LLStringFn::replace_nonprintable_in_ascii(mMusicURL, LL_UNKNOWN_CHAR); } void LLParcel::setMediaURL(const std::string& url) @@ -306,7 +306,7 @@ void LLParcel::setMediaURL(const std::string& url) // abstraction layer if it's ever added. // This should really filter the url in some way. Other than // simply requiring non-printable. - LLStringFn::replace_nonprintable(mMediaURL, LL_UNKNOWN_CHAR); + LLStringFn::replace_nonprintable_in_ascii(mMediaURL, LL_UNKNOWN_CHAR); } void LLParcel::setMediaDesc(const std::string& desc) |