From f1380f2fc3eecd8dfd2f75d053ff86716d5055f7 Mon Sep 17 00:00:00 2001 From: Robert Knop Date: Mon, 19 Jan 2009 20:40:59 +0000 Subject: 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) --- indra/llinventory/llparcel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llinventory/llparcel.cpp') 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) -- cgit v1.2.3