summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellandaudio.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanellandaudio.cpp')
-rw-r--r--indra/newview/llpanellandaudio.cpp190
1 files changed, 95 insertions, 95 deletions
diff --git a/indra/newview/llpanellandaudio.cpp b/indra/newview/llpanellandaudio.cpp
index 9e3fc54477..bad9c651a2 100644
--- a/indra/newview/llpanellandaudio.cpp
+++ b/indra/newview/llpanellandaudio.cpp
@@ -6,21 +6,21 @@
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
- *
+ *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ *
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
@@ -53,9 +53,9 @@
// Values for the parcel voice settings radio group
enum
{
- kRadioVoiceChatEstate = 0,
- kRadioVoiceChatPrivate = 1,
- kRadioVoiceChatDisable = 2
+ kRadioVoiceChatEstate = 0,
+ kRadioVoiceChatPrivate = 1,
+ kRadioVoiceChatDisable = 2
};
//---------------------------------------------------------------------------
@@ -63,7 +63,7 @@ enum
//---------------------------------------------------------------------------
LLPanelLandAudio::LLPanelLandAudio(LLParcelSelectionHandle& parcel)
-: LLPanel(/*std::string("land_media_panel")*/), mParcel(parcel)
+: LLPanel(/*std::string("land_media_panel")*/), mParcel(parcel)
{
}
@@ -76,137 +76,137 @@ LLPanelLandAudio::~LLPanelLandAudio()
BOOL LLPanelLandAudio::postBuild()
{
- mCheckSoundLocal = getChild<LLCheckBoxCtrl>("check sound local");
- childSetCommitCallback("check sound local", onCommitAny, this);
+ mCheckSoundLocal = getChild<LLCheckBoxCtrl>("check sound local");
+ childSetCommitCallback("check sound local", onCommitAny, this);
- mCheckParcelEnableVoice = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel");
- childSetCommitCallback("parcel_enable_voice_channel", onCommitAny, this);
+ mCheckParcelEnableVoice = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel");
+ childSetCommitCallback("parcel_enable_voice_channel", onCommitAny, this);
- // This one is always disabled so no need for a commit callback
- mCheckEstateDisabledVoice = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel_is_estate_disabled");
+ // This one is always disabled so no need for a commit callback
+ mCheckEstateDisabledVoice = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel_is_estate_disabled");
- mCheckParcelVoiceLocal = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel_local");
- childSetCommitCallback("parcel_enable_voice_channel_local", onCommitAny, this);
+ mCheckParcelVoiceLocal = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel_local");
+ childSetCommitCallback("parcel_enable_voice_channel_local", onCommitAny, this);
- mMusicURLEdit = getChild<LLLineEditor>("music_url");
- childSetCommitCallback("music_url", onCommitAny, this);
+ mMusicURLEdit = getChild<LLLineEditor>("music_url");
+ childSetCommitCallback("music_url", onCommitAny, this);
- mCheckAVSoundAny = getChild<LLCheckBoxCtrl>("all av sound check");
- childSetCommitCallback("all av sound check", onCommitAny, this);
+ mCheckAVSoundAny = getChild<LLCheckBoxCtrl>("all av sound check");
+ childSetCommitCallback("all av sound check", onCommitAny, this);
- mCheckAVSoundGroup = getChild<LLCheckBoxCtrl>("group av sound check");
- childSetCommitCallback("group av sound check", onCommitAny, this);
+ mCheckAVSoundGroup = getChild<LLCheckBoxCtrl>("group av sound check");
+ childSetCommitCallback("group av sound check", onCommitAny, this);
mCheckObscureMOAP = getChild<LLCheckBoxCtrl>("obscure_moap");
childSetCommitCallback("obscure_moap", onCommitAny, this);
- return TRUE;
+ return TRUE;
}
// public
void LLPanelLandAudio::refresh()
{
- LLParcel *parcel = mParcel->getParcel();
+ LLParcel *parcel = mParcel->getParcel();
- if (!parcel)
- {
- clearCtrls();
- }
- else
- {
- // something selected, hooray!
+ if (!parcel)
+ {
+ clearCtrls();
+ }
+ else
+ {
+ // something selected, hooray!
- // Display options
- BOOL can_change_media = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA);
+ // Display options
+ BOOL can_change_media = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA);
- mCheckSoundLocal->set( parcel->getSoundLocal() );
- mCheckSoundLocal->setEnabled( can_change_media );
+ mCheckSoundLocal->set( parcel->getSoundLocal() );
+ mCheckSoundLocal->setEnabled( can_change_media );
- bool allow_voice = parcel->getParcelFlagAllowVoice();
+ bool allow_voice = parcel->getParcelFlagAllowVoice();
- LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
- if (region && region->isVoiceEnabled())
- {
- mCheckEstateDisabledVoice->setVisible(false);
+ LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
+ if (region && region->isVoiceEnabled())
+ {
+ mCheckEstateDisabledVoice->setVisible(false);
- mCheckParcelEnableVoice->setVisible(true);
- mCheckParcelEnableVoice->setEnabled( can_change_media );
- mCheckParcelEnableVoice->set(allow_voice);
+ mCheckParcelEnableVoice->setVisible(true);
+ mCheckParcelEnableVoice->setEnabled( can_change_media );
+ mCheckParcelEnableVoice->set(allow_voice);
- mCheckParcelVoiceLocal->setEnabled( can_change_media && allow_voice );
- }
- else
- {
- // Voice disabled at estate level, overrides parcel settings
- // Replace the parcel voice checkbox with a disabled one
- // labelled with an explanatory message
- mCheckEstateDisabledVoice->setVisible(true);
+ mCheckParcelVoiceLocal->setEnabled( can_change_media && allow_voice );
+ }
+ else
+ {
+ // Voice disabled at estate level, overrides parcel settings
+ // Replace the parcel voice checkbox with a disabled one
+ // labelled with an explanatory message
+ mCheckEstateDisabledVoice->setVisible(true);
- mCheckParcelEnableVoice->setVisible(false);
- mCheckParcelEnableVoice->setEnabled(false);
- mCheckParcelVoiceLocal->setEnabled(false);
- }
+ mCheckParcelEnableVoice->setVisible(false);
+ mCheckParcelEnableVoice->setEnabled(false);
+ mCheckParcelVoiceLocal->setEnabled(false);
+ }
- mCheckParcelEnableVoice->set(allow_voice);
- mCheckParcelVoiceLocal->set(!parcel->getParcelFlagUseEstateVoiceChannel());
+ mCheckParcelEnableVoice->set(allow_voice);
+ mCheckParcelVoiceLocal->set(!parcel->getParcelFlagUseEstateVoiceChannel());
- mMusicURLEdit->setText(parcel->getMusicURL());
- mMusicURLEdit->setEnabled( can_change_media );
+ mMusicURLEdit->setText(parcel->getMusicURL());
+ mMusicURLEdit->setEnabled( can_change_media );
- BOOL can_change_av_sounds = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_OPTIONS) && parcel->getHaveNewParcelLimitData();
- mCheckAVSoundAny->set(parcel->getAllowAnyAVSounds());
- mCheckAVSoundAny->setEnabled(can_change_av_sounds);
+ BOOL can_change_av_sounds = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_OPTIONS) && parcel->getHaveNewParcelLimitData();
+ mCheckAVSoundAny->set(parcel->getAllowAnyAVSounds());
+ mCheckAVSoundAny->setEnabled(can_change_av_sounds);
- mCheckAVSoundGroup->set(parcel->getAllowGroupAVSounds() || parcel->getAllowAnyAVSounds()); // On if "Everyone" is on
- mCheckAVSoundGroup->setEnabled(can_change_av_sounds && !parcel->getAllowAnyAVSounds()); // Enabled if "Everyone" is off
+ mCheckAVSoundGroup->set(parcel->getAllowGroupAVSounds() || parcel->getAllowAnyAVSounds()); // On if "Everyone" is on
+ mCheckAVSoundGroup->setEnabled(can_change_av_sounds && !parcel->getAllowAnyAVSounds()); // Enabled if "Everyone" is off
mCheckObscureMOAP->set(parcel->getObscureMOAP());
mCheckObscureMOAP->setEnabled(can_change_media);
- }
+ }
}
// static
void LLPanelLandAudio::onCommitAny(LLUICtrl*, void *userdata)
{
- LLPanelLandAudio *self = (LLPanelLandAudio *)userdata;
+ LLPanelLandAudio *self = (LLPanelLandAudio *)userdata;
- LLParcel* parcel = self->mParcel->getParcel();
- if (!parcel)
- {
- return;
- }
+ LLParcel* parcel = self->mParcel->getParcel();
+ if (!parcel)
+ {
+ return;
+ }
- // Extract data from UI
- BOOL sound_local = self->mCheckSoundLocal->get();
- std::string music_url = self->mMusicURLEdit->getText();
+ // Extract data from UI
+ BOOL sound_local = self->mCheckSoundLocal->get();
+ std::string music_url = self->mMusicURLEdit->getText();
- BOOL voice_enabled = self->mCheckParcelEnableVoice->get();
- BOOL voice_estate_chan = !self->mCheckParcelVoiceLocal->get();
+ BOOL voice_enabled = self->mCheckParcelEnableVoice->get();
+ BOOL voice_estate_chan = !self->mCheckParcelVoiceLocal->get();
- BOOL any_av_sound = self->mCheckAVSoundAny->get();
- BOOL group_av_sound = TRUE; // If set to "Everyone" then group is checked as well
- if (!any_av_sound)
- { // If "Everyone" is off, use the value from the checkbox
- group_av_sound = self->mCheckAVSoundGroup->get();
- }
+ BOOL any_av_sound = self->mCheckAVSoundAny->get();
+ BOOL group_av_sound = TRUE; // If set to "Everyone" then group is checked as well
+ if (!any_av_sound)
+ { // If "Everyone" is off, use the value from the checkbox
+ group_av_sound = self->mCheckAVSoundGroup->get();
+ }
bool obscure_moap = self->mCheckObscureMOAP->get();
- // Remove leading/trailing whitespace (common when copying/pasting)
- LLStringUtil::trim(music_url);
+ // Remove leading/trailing whitespace (common when copying/pasting)
+ LLStringUtil::trim(music_url);
- // Push data into current parcel
- parcel->setParcelFlag(PF_ALLOW_VOICE_CHAT, voice_enabled);
- parcel->setParcelFlag(PF_USE_ESTATE_VOICE_CHAN, voice_estate_chan);
- parcel->setParcelFlag(PF_SOUND_LOCAL, sound_local);
- parcel->setMusicURL(music_url);
- parcel->setAllowAnyAVSounds(any_av_sound);
- parcel->setAllowGroupAVSounds(group_av_sound);
+ // Push data into current parcel
+ parcel->setParcelFlag(PF_ALLOW_VOICE_CHAT, voice_enabled);
+ parcel->setParcelFlag(PF_USE_ESTATE_VOICE_CHAN, voice_estate_chan);
+ parcel->setParcelFlag(PF_SOUND_LOCAL, sound_local);
+ parcel->setMusicURL(music_url);
+ parcel->setAllowAnyAVSounds(any_av_sound);
+ parcel->setAllowGroupAVSounds(group_av_sound);
parcel->setObscureMOAP(obscure_moap);
- // Send current parcel data upstream to server
- LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
+ // Send current parcel data upstream to server
+ LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
- // Might have changed properties, so let's redraw!
- self->refresh();
+ // Might have changed properties, so let's redraw!
+ self->refresh();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 08:49:03 +0000