From d60f16540dba5616cd8260046b44ebc2a1047065 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Thu, 4 Jan 2007 02:04:29 +0000
Subject: svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431

This turned up the following "lost" changes:

	llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly
	llfontgl.cpp (from maintenance r50207) - whitespace only
	inventorybridge.cpp (property - non-executable)
	skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
---
 indra/newview/llviewerobject.cpp | 44 +++++++++++-----------------------------
 1 file changed, 12 insertions(+), 32 deletions(-)

(limited to 'indra/newview/llviewerobject.cpp')

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 2d97c6f2a4..7db94eb972 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -49,7 +49,6 @@
 #include "llviewercamera.h"
 #include "llviewerimagelist.h"
 #include "llviewerinventory.h"
-#include "llviewermedialist.h"
 #include "llviewerobjectlist.h"
 #include "llviewerparceloverlay.h"
 #include "llviewerpartsource.h"
@@ -3266,16 +3265,8 @@ void LLViewerObject::setMediaType(U8 media_type)
 	else if (mMedia->mMediaType != media_type)
 	{
 		mMedia->mMediaType = media_type;
-		if (gMediaList)
-		{
-			// we're using web pages on prims
-			gMediaList->updatedMediaURL(this);
-		}
-		if (mDrawable.notNull())
-		{
-			// move this object's faces into LLDrawPoolMedia
-			gPipeline.markTextured(mDrawable);
-		}
+
+		// TODO: update materials with new image
 	}
 }
 
@@ -3300,30 +3291,15 @@ void LLViewerObject::setMediaURL(const LLString& media_url)
 		mMedia = new LLViewerObjectMedia;
 		mMedia->mMediaURL = media_url;
 		mMedia->mPassedWhitelist = FALSE;
-		if (gMediaList)
-		{
-			gMediaList->addedMediaURL(this);
-		}
-		if (mDrawable.notNull())
-		{
-			// move this object's faces into LLDrawPoolMedia
-			gPipeline.markTextured(mDrawable);
-		}
+
+		// TODO: update materials with new image
 	}
 	else if (mMedia->mMediaURL != media_url)
 	{
 		mMedia->mMediaURL = media_url;
 		mMedia->mPassedWhitelist = FALSE;
-		if (gMediaList)
-		{
-			// we're using web pages on prims
-			gMediaList->updatedMediaURL(this);
-		}
-		if (mDrawable.notNull())
-		{
-			// move this object's faces into LLDrawPoolMedia
-			gPipeline.markTextured(mDrawable);
-		}
+
+		// TODO: update materials with new image
 	}
 }
 
@@ -4137,6 +4113,12 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow
 		}
 	}
 
+	if ( mAudioSourcep )
+	{
+		gAudiop->cleanupAudioSource(mAudioSourcep);
+		mAudioSourcep = NULL;
+	}
+
 	getAudioSource(owner_id);
 
 	if (mAudioSourcep)
@@ -4153,8 +4135,6 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow
 
 LLAudioSource *LLViewerObject::getAudioSource(const LLUUID& owner_id)
 {
-	LLMemType mt(LLMemType::MTYPE_OBJECT);
-	
 	if (!mAudioSourcep)
 	{
 		// Arbitrary low gain for a sound that's not playing.
-- 
cgit v1.2.3