From 533988ee86d942851a79a2833914033e89a05f4d Mon Sep 17 00:00:00 2001
From: skolb <none@none>
Date: Wed, 2 Dec 2009 18:12:30 -0800
Subject: unify the two media auto play preferences into one.  The
 ParcelMediaAutoPlayEnable flag now controls both (horribly named, but must be
 preserved for legacy purposes).

---
 indra/newview/llviewermedia.cpp                               |  2 +-
 .../skins/default/xui/en/panel_preferences_privacy.xml        | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 095430dcfc..abc165e558 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -58,7 +58,7 @@
 #include <boost/bind.hpp>	// for SkinFolder listener
 #include <boost/signals2.hpp>
 
-/*static*/ const char* LLViewerMedia::AUTO_PLAY_MEDIA_SETTING = "AutoPlayMedia";
+/*static*/ const char* LLViewerMedia::AUTO_PLAY_MEDIA_SETTING = "ParcelMediaAutoPlayEnable";
 
 // Move this to its own file.
 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 23832ba120..29e9b476eb 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -78,7 +78,7 @@
      top_pad="10"
      width="350" />
     <check_box
-     control_name="AutoPlayMedia"
+     control_name="ParcelMediaAutoPlayEnable"
      height="16"
      label="Allow Media Autoplay"
      layout="topleft"
@@ -86,15 +86,6 @@
      name="autoplay_enabled"
      top_pad="10"
      width="350" />
-    <check_box
-     control_name="ParcelMediaAutoPlayEnable"
-     height="16"
-     label="Automatically Play Parcel Media"
-     layout="topleft"
-     left="30"
-     name="parcel_autoplay_enabled"
-     top_pad="10"
-     width="350" />
    <text
       type="string"
     length="1"
-- 
cgit v1.2.3