From c791570b8f7704dd3af382ab1d6ad446af1fa671 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Mon, 14 Jun 2010 14:29:10 +0200
Subject: make it compile and run.

TODO: llpanellandmedia.cpp and llviewermedia.cpp need a proper fix
---
 linden/indra/newview/llpanellandmedia.cpp | 51 -------------------------------
 1 file changed, 51 deletions(-)

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

diff --git a/linden/indra/newview/llpanellandmedia.cpp b/linden/indra/newview/llpanellandmedia.cpp
index fc84bb5..db68c42 100644
--- a/linden/indra/newview/llpanellandmedia.cpp
+++ b/linden/indra/newview/llpanellandmedia.cpp
@@ -172,57 +172,6 @@ void LLPanelLandMedia::refresh()
 		BOOL can_change_media = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA);
 
  		mCheckSoundLocal->set( parcel->getSoundLocal() );
-		mCheckSoundLocal->setEnabled( can_change_media );
-
-		LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
-		if (!region)
-		{
-			// never seen this happen, but log it
-			llwarns << "Couldn't get selected region." << llendl;
-		}
-
-		// We need to do this differently for OpenSim because it doesn't include
-		// REGION_FLAGS_ALLOW_VOICE in the "RegionInfo" message as of 0.6.9 PF -- MC
-		bool allow_voice = parcel->getParcelFlagAllowVoice();
-		if (gHippoGridManager->getConnectedGrid()->isSecondLife())
-		{
-			if (region && region->isVoiceEnabled()) // estate-wide voice-disable overrides all
-			{
-				mCheckEnableVoiceChatIsEstateDisabled->setVisible(false);
-
-				mCheckEnableVoiceChat->setVisible(true);
-				mCheckEnableVoiceChat->setEnabled( can_change_media );
-				mCheckEnableVoiceChat->set(allow_voice);
-
-				mCheckEnableVoiceChatParcel->setEnabled( can_change_media && allow_voice );
-			}
-			else // disabled at region level
-			{
-				mCheckEnableVoiceChatIsEstateDisabled->setVisible(true); // always disabled
-				mCheckEnableVoiceChat->setVisible(false);
-				mCheckEnableVoiceChat->setEnabled(false);
-				mCheckEnableVoiceChat->set(false);
-
-				mCheckEnableVoiceChatParcel->setEnabled(false);
-			}
-		}
-		else
-		{
-			mCheckEnableVoiceChatIsEstateDisabled->setVisible(true);
-
-			mCheckEnableVoiceChat->setVisible(true);
-			mCheckEnableVoiceChat->setEnabled( can_change_media );
-			mCheckEnableVoiceChat->set(allow_voice);
-
-			mCheckEnableVoiceChatParcel->setEnabled( can_change_media && allow_voice );
-		}
-
-		mCheckEnableVoiceChatParcel->set(!parcel->getParcelFlagUseEstateVoiceChannel());
-
-		mMusicURLEdit->setText(parcel->getMusicURL());
-		mMusicURLEdit->setEnabled( can_change_media );
-
-
 
 		childSetText("current_url", parcel->getMediaCurrentURL());
 
-- 
cgit v1.1