From 798d367d54a6c6379ad355bd8345fa40e31e7fe9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 6 Sep 2008 18:24:57 -0500
Subject: Second Life viewer sources 1.21.0-RC

---
 linden/indra/newview/llviewerparcelmedia.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview/llviewerparcelmedia.cpp')

diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index c29f277..956ed03 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/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);
-- 
cgit v1.1