From 02c1a6a515c5a18eece01aafb8de7a88b8c8c83f Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 5 May 2011 11:26:13 -0700
Subject: EXP-754 [PUBLIC] Remember last email address for snapshots

---
 indra/newview/skins/default/xui/en/floater_postcard.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_postcard.xml b/indra/newview/skins/default/xui/en/floater_postcard.xml
index b4ecedd981..8da35e9d7f 100644
--- a/indra/newview/skins/default/xui/en/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/en/floater_postcard.xml
@@ -36,6 +36,7 @@
         Recipient&apos;s Email:
     </text>
     <line_editor
+     control_name="LastPostcardRecipient"
      follows="left|top"
      height="20"
      layout="topleft"
-- 
cgit v1.2.3


From 3039663148b0adc64220964b10cad595e5137cc0 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 9 May 2011 15:10:56 -0700
Subject: EXP-802 Add a check box to enable/disable voice chat.

---
 .../skins/default/xui/en/floater_sound_devices.xml  | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_sound_devices.xml b/indra/newview/skins/default/xui/en/floater_sound_devices.xml
index c7c7a05af2..304987c3d5 100644
--- a/indra/newview/skins/default/xui/en/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/en/floater_sound_devices.xml
@@ -11,7 +11,7 @@
  save_rect="true"
  single_instance="true"
  bevel_style="in"
- height="140"
+ height="164"
  layout="topleft"
  name="floater_sound_devices"
  title="Sound Devices"
@@ -25,4 +25,23 @@
     left="2"
     top="26"
     class="panel_voice_device_settings"/>
+  <text
+    name="voice_label"
+    top="136"
+    left="12"
+    height="14"
+    width="80"
+    layout="topleft"
+    >Voice Chat</text>
+  <check_box
+    layout="topleft"
+    control_name="EnableVoiceChat"
+    follows="bottom|left"
+    top="138"
+    left="80"
+    name="enable_voice"
+    width="100"
+    height="14"
+    label="Enabled"
+    />
 </floater>
-- 
cgit v1.2.3


From 9dbc3301f677316be3266caa792517f235438e81 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 11 May 2011 13:14:48 -0700
Subject: EXP-809 FIX Make Script Warning/Error window scrolling behavior match
 that of Chat history

---
 indra/newview/skins/default/xui/en/floater_script_debug_panel.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
index d1db5c17ba..ce96ea232e 100644
--- a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
@@ -20,5 +20,6 @@
      parse_highlights="true" 
      read_only="true"
      width="420"
+     track_bottom="true" 
      word_wrap="true" />
 </floater>
-- 
cgit v1.2.3


From c83eff097e673e8a640fbc0a32cd6f0b34b4a8cf Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 11 May 2011 17:46:51 -0700
Subject: EXP-760 Selecting No Device for output and input in Sound Devices in
 Basic mode still results in voice having input and output - also 2 default
 options

---
 indra/newview/skins/default/xui/en/panel_sound_devices.xml | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml
index 9812281323..ccae7c5350 100644
--- a/indra/newview/skins/default/xui/en/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/en/panel_sound_devices.xml
@@ -11,14 +11,6 @@
 	  name="default_text">
 		Default
 	</panel.string>
-	<panel.string
-	  name="default system device">
-		Default system device
-	</panel.string>
-	<panel.string
-	  name="no device">
-		No device
-	</panel.string>
 	<icon
 		   height="18"
 		   image_name="Microphone_On"
-- 
cgit v1.2.3