Second Life viewer sources 1.23.0-RC

1 files changed, 68 insertions, 41 deletions

diff --git a/linden/indra/newview/llpanellandmedia.cpp b/linden/indra/newview/llpanellandmedia.cpp
index d6787f8..b8886c9 100644
--- a/linden/indra/newview/llpanellandmedia.cpp
+++ b/linden/indra/newview/llpanellandmedia.cpp
@@ -18,7 +18,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -37,6 +38,7 @@
 // viewer includes
 #include "llmimetypes.h"
 #include "llviewerparcelmgr.h"
+#include "llviewerregion.h"
 #include "lluictrlfactory.h"
 
 // library includes
@@ -53,20 +55,32 @@
 #include "lltexturectrl.h"
 #include "roles_constants.h"
 
-// Values for the parcel voice settings radio group
-enum
-{
-        kRadioVoiceChatEstate = 0,
-        kRadioVoiceChatPrivate = 1,
-        kRadioVoiceChatDisable = 2
-};
-
 //---------------------------------------------------------------------------
 // LLPanelLandMedia
 //---------------------------------------------------------------------------
 
 LLPanelLandMedia::LLPanelLandMedia(LLParcelSelectionHandle& parcel)
-:       LLPanel(std::string("land_media_panel")), mParcel(parcel)
+:       LLPanel(std::string("land_media_panel")),
+
+        mParcel(parcel),
+        mCheckSoundLocal(NULL),
+        mSoundHelpButton(NULL),
+        mCheckEnableVoiceChat(NULL),
+        mCheckEnableVoiceChatIsEstateDisabled(NULL),
+        mCheckEnableVoiceChatParcel(NULL),
+        mMusicURLEdit(NULL),
+        mMediaURLEdit(NULL),
+        mMediaDescEdit(NULL),
+        mMediaTypeCombo(NULL),
+        mSetURLButton(NULL),
+        mMediaHeightCtrl(NULL),
+        mMediaWidthCtrl(NULL),
+        mMediaSizeCtrlLabel(NULL),
+        mMediaTextureCtrl(NULL),
+        mMediaAutoScaleCheck(NULL),
+        mMediaLoopCheck(NULL),
+        mMediaUrlCheck(NULL),
+        mMusicUrlCheck(NULL)
 {
 }
 
@@ -78,13 +92,27 @@ LLPanelLandMedia::~LLPanelLandMedia()
 }
 
 
+// static
+void LLPanelLandMedia::onClickSoundHelp(void*)
+{
+        LLNotifications::instance().add("ClickSoundHelpLand");
+}
+
+
 BOOL LLPanelLandMedia::postBuild()
 {
         mCheckSoundLocal = getChild<LLCheckBoxCtrl>("check sound local");
         childSetCommitCallback("check sound local", onCommitAny, this);
 
-        mRadioVoiceChat = getChild<LLRadioGroup>("parcel_voice_channel");
-        childSetCommitCallback("parcel_voice_channel", onCommitAny, this);
+        mSoundHelpButton = getChild<LLButton>("?");
+        mSoundHelpButton->setClickedCallback(onClickSoundHelp, this);
+
+        mCheckEnableVoiceChat = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel");
+        childSetCommitCallback("parcel_enable_voice_channel", onCommitAny, this);
+        mCheckEnableVoiceChatIsEstateDisabled = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel_is_estate_disabled");
+        childSetCommitCallback("parcel_enable_voice_channel_is_estate_disabled", onCommitAny, this);
+        mCheckEnableVoiceChatParcel = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel_parcel");
+        childSetCommitCallback("parcel_enable_voice_channel_parcel", onCommitAny, this);
 
         mMusicURLEdit = getChild<LLLineEditor>("music_url");
         childSetCommitCallback("music_url", onCommitAny, this);
@@ -150,19 +178,36 @@ void LLPanelLandMedia::refresh()
                 mCheckSoundLocal->set( parcel->getSoundLocal() );
                 mCheckSoundLocal->setEnabled( can_change_media );
 
-                if(parcel->getParcelFlagAllowVoice())
+                LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
+                if (!region)
                 {
-                        if(parcel->getParcelFlagUseEstateVoiceChannel())
-                                mRadioVoiceChat->setSelectedIndex(kRadioVoiceChatEstate);
-                        else
-                                mRadioVoiceChat->setSelectedIndex(kRadioVoiceChatPrivate);
+                        // never seen this happen, but log it
+                        llwarns << "Couldn't get selected region." << llendl;
                 }
-                else
+
+                if (region && region->isVoiceEnabled()) // estate-wide voice-disable overrides all
                 {
-                        mRadioVoiceChat->setSelectedIndex(kRadioVoiceChatDisable);
+                        bool allow_voice = parcel->getParcelFlagAllowVoice();
+
+                        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);
                 }
 
-                mRadioVoiceChat->setEnabled( can_change_media );
+                mCheckEnableVoiceChatParcel->set(!parcel->getParcelFlagUseEstateVoiceChannel());
 
                 mMusicURLEdit->setText(parcel->getMusicURL());
                 mMusicURLEdit->setEnabled( can_change_media );
@@ -338,7 +383,6 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata)
 
         // Extract data from UI
         BOOL sound_local                = self->mCheckSoundLocal->get();
-        int voice_setting               = self->mRadioVoiceChat->getSelectedIndex();
         std::string music_url   = self->mMusicURLEdit->getText();
         std::string media_url   = self->mMediaURLEdit->getText();
         std::string media_desc  = self->mMediaDescEdit->getText();
@@ -351,27 +395,10 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata)
         S32 media_height                = (S32)self->mMediaHeightCtrl->get();
         LLUUID media_id                 = self->mMediaTextureCtrl->getImageAssetID();
 
-        self->childSetText("mime_type", mime_type);
-
-        BOOL voice_enabled;
-        BOOL voice_estate_chan;
+        BOOL voice_enabled = self->mCheckEnableVoiceChat->get();
+        BOOL voice_estate_chan = ! self->mCheckEnableVoiceChatParcel->get();
 
-        switch(voice_setting)
-        {
-                default:
-                case kRadioVoiceChatEstate:
-                        voice_enabled = TRUE;
-                        voice_estate_chan = TRUE;
-                break;
-                case kRadioVoiceChatPrivate:
-                        voice_enabled = TRUE;
-                        voice_estate_chan = FALSE;
-                break;
-                case kRadioVoiceChatDisable:
-                        voice_enabled = FALSE;
-                        voice_estate_chan = FALSE;
-                break;
-        }
+        self->childSetText("mime_type", mime_type);
 
         // Remove leading/trailing whitespace (common when copying/pasting)
         LLStringUtil::trim(music_url);