diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llviewerparcelmedia.cpp | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llviewerparcelmedia.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmedia.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index ba6a6005bf..272080678f 100644 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -120,7 +120,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel) } std::string mediaUrl = std::string ( parcel->getMediaURL () ); - LLString::trim(mediaUrl); + LLStringUtil::trim(mediaUrl); // has something changed? if ( ( LLViewerMedia::getMediaURL() != mediaUrl ) @@ -370,7 +370,7 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void * { // temporarily store these new values in the parcel parcel->setMediaURL(media_url); - parcel->setMediaType(media_type.c_str()); + parcel->setMediaType(media_type); parcel->setMediaID(media_id); parcel->setMediaWidth(media_width); parcel->setMediaHeight(media_height); |