3 files changed, 30 insertions, 12 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index 6c11a06..319e495 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -1180,17 +1180,6 @@ Please choose the male or female avatar.
                         Female
                 </option>
         </alert>
-        <alert modal="true" name="ConfirmQuit">
-                <message name="message">
-                        Are you sure you want to quit?
-                </message>
-                <option name="Yes">
-                        Yes
-                </option>
-                <option name="No">
-                        No
-                </option>
-        </alert>
         <alert modal="true" name="RegionNoTerraforming">
                 <message name="message">
                         The region [REGION] does not allow terraforming.
@@ -4102,6 +4091,20 @@ will only work if a script is added with a money() event.
                         Cancel
                 </option>
         </alert>
+        <alert modal="true" name="ConfirmQuit">
+                <message name="message">
+                        Are you sure you want to quit?
+                </message>
+                <ignore name="ignore">
+                        Ignore
+                </ignore>
+                <option name="Quit">
+                        Quit
+                </option>
+                <option name="Continue">
+                        Continue
+                </option>
+        </alert>
         <alert modal="true" name="HelpReportAbuseEmailLL" >
                 <message name="message">
 Use this tool to report violations of the Terms of Service 
diff --git a/linden/indra/newview/skins/xui/en-us/panel_login.xml b/linden/indra/newview/skins/xui/en-us/panel_login.xml
index 7df2151..ba4884d 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_login.xml
@@ -91,4 +91,10 @@
              left="698" mouse_opaque="true" name="version_text" v_pad="0" width="100">
                 1.23.4 (5)
         </text>
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="14" drop_shadow_visible="true" follows="right|bottom"
+             font="SansSerifSmall" h_pad="0" halign="right" height="12" hidden="false"
+             left="698" mouse_opaque="true" name="channel_text" v_pad="0" width="300">
+                [Viewer Channel Name]
+        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
index 9feaafc..b584151 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
@@ -28,7 +28,8 @@
              image_unselected="status_buy_currency.tga" label="" label_selected=""
              left="-120" mouse_opaque="true" name="buycurrency" scale_image="true"
              tool_tip="Buy currency" width="16" />
-        <text type="string" length="12" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        <text type="string" length="12" bg_visible="false" border_drop_shadow_visible="false" 
+                 border_visible="false"
              bottom="-20" disabled_color="1 1 1 1" drop_shadow_visible="true"
              enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
              halign="right" height="18" hidden="false" left="-210" mouse_opaque="true"
@@ -36,6 +37,14 @@
              v_pad="2" width="80">
                 12:00 AM
         </text>
+        
+        <text hidden="true" name="StatBarDaysOfWeek">
+                Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
+        </text>
+        <text hidden="true" name="StatBarMonthsOfYear">
+                January:February:March:April:May:June:July:August:September:October:November:December
+        </text>
+
         <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="16" hidden="false"
              image_disabled="status_script_debug.tga"