lost in merge: 1 debug setting, some member variables from llpanellandmedia

 todo: review llpanellandmedia; port flotervoicelicense

3 files changed, 38 insertions, 20 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 4d80845..f70c0fc 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4135,6 +4135,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>DebugPluginDisableTimeout</key>
+  <map>
+    <key>Comment</key>
+    <string>Disable the code which watches for plugins that are crashed or hung</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>DebugShowColor</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llpanellandmedia.cpp b/linden/indra/newview/llpanellandmedia.cpp
index a8e7c4a..fc84bb5 100644
--- a/linden/indra/newview/llpanellandmedia.cpp
+++ b/linden/indra/newview/llpanellandmedia.cpp
@@ -171,8 +171,8 @@ void LLPanelLandMedia::refresh()
                 // Display options
                 BOOL can_change_media = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA);
 
-//imprudence fixme              mCheckSoundLocal->set( parcel->getSoundLocal() );
-//imprudence fixme              mCheckSoundLocal->setEnabled( can_change_media );
+                mCheckSoundLocal->set( parcel->getSoundLocal() );
+                mCheckSoundLocal->setEnabled( can_change_media );
 
                 LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
                 if (!region)
@@ -188,39 +188,39 @@ void LLPanelLandMedia::refresh()
                 {
                         if (region && region->isVoiceEnabled()) // estate-wide voice-disable overrides all
                         {
-//imprudence fixme                              mCheckEnableVoiceChatIsEstateDisabled->setVisible(false);
+                                mCheckEnableVoiceChatIsEstateDisabled->setVisible(false);
 
-//imprudence fixme                              mCheckEnableVoiceChat->setVisible(true);
-//imprudence fixme                              mCheckEnableVoiceChat->setEnabled( can_change_media );
-//imprudence fixme                              mCheckEnableVoiceChat->set(allow_voice);
+                                mCheckEnableVoiceChat->setVisible(true);
+                                mCheckEnableVoiceChat->setEnabled( can_change_media );
+                                mCheckEnableVoiceChat->set(allow_voice);
 
-//imprudence fixme                              mCheckEnableVoiceChatParcel->setEnabled( can_change_media && allow_voice );
+                                mCheckEnableVoiceChatParcel->setEnabled( can_change_media && allow_voice );
                         }
                         else // disabled at region level
                         {
-//imprudence fixme                              mCheckEnableVoiceChatIsEstateDisabled->setVisible(true); // always disabled
-//imprudence fixme                              mCheckEnableVoiceChat->setVisible(false);
-//imprudence fixme                              mCheckEnableVoiceChat->setEnabled(false);
-//imprudence fixme                              mCheckEnableVoiceChat->set(false);
+                                mCheckEnableVoiceChatIsEstateDisabled->setVisible(true); // always disabled
+                                mCheckEnableVoiceChat->setVisible(false);
+                                mCheckEnableVoiceChat->setEnabled(false);
+                                mCheckEnableVoiceChat->set(false);
 
-//imprudence fixme                              mCheckEnableVoiceChatParcel->setEnabled(false);
+                                mCheckEnableVoiceChatParcel->setEnabled(false);
                         }
                 }
                 else
                 {
-//imprudence fixme                      mCheckEnableVoiceChatIsEstateDisabled->setVisible(true);
+                        mCheckEnableVoiceChatIsEstateDisabled->setVisible(true);
 
-//imprudence fixme                      mCheckEnableVoiceChat->setVisible(true);
-//imprudence fixme                      mCheckEnableVoiceChat->setEnabled( can_change_media );
-//imprudence fixme                      mCheckEnableVoiceChat->set(allow_voice);
+                        mCheckEnableVoiceChat->setVisible(true);
+                        mCheckEnableVoiceChat->setEnabled( can_change_media );
+                        mCheckEnableVoiceChat->set(allow_voice);
 
-//imprudence fixme                      mCheckEnableVoiceChatParcel->setEnabled( can_change_media && allow_voice );
+                        mCheckEnableVoiceChatParcel->setEnabled( can_change_media && allow_voice );
                 }
 
-//imprudence fixme              mCheckEnableVoiceChatParcel->set(!parcel->getParcelFlagUseEstateVoiceChannel());
+                mCheckEnableVoiceChatParcel->set(!parcel->getParcelFlagUseEstateVoiceChannel());
 
-//imprudence fixme              mMusicURLEdit->setText(parcel->getMusicURL());
-//imprudence fixme              mMusicURLEdit->setEnabled( can_change_media );
+                mMusicURLEdit->setText(parcel->getMusicURL());
+                mMusicURLEdit->setEnabled( can_change_media );
 
 
 
diff --git a/linden/indra/newview/llpanellandmedia.h b/linden/indra/newview/llpanellandmedia.h
index c883d98..d63f0f6 100644
--- a/linden/indra/newview/llpanellandmedia.h
+++ b/linden/indra/newview/llpanellandmedia.h
@@ -61,6 +61,12 @@ private:
         static void onClickRemoveURLFilter(void *userdata);
         
 private:
+        LLCheckBoxCtrl* mCheckSoundLocal;
+        LLButton*       mSoundHelpButton;
+        LLCheckBoxCtrl* mCheckEnableVoiceChat;
+        LLCheckBoxCtrl* mCheckEnableVoiceChatIsEstateDisabled;
+        LLCheckBoxCtrl* mCheckEnableVoiceChatParcel;
+        LLLineEditor*   mMusicURLEdit;
         LLLineEditor*   mMediaURLEdit;
         LLLineEditor*   mMediaDescEdit;
         LLComboBox*             mMediaTypeCombo;
@@ -75,6 +81,7 @@ private:
         LLCheckBoxCtrl* mMediaAutoScaleCheck;
         LLCheckBoxCtrl* mMediaLoopCheck;
         LLCheckBoxCtrl* mMediaUrlCheck;
+        LLCheckBoxCtrl* mMusicUrlCheck;
         LLHandle<LLFloater>     mURLEntryFloater;
         LLCheckBoxCtrl* mMediaNavigateAllowCheck;
         LLCheckBoxCtrl* mMediaURLFilterCheck;