Second Life viewer sources 1.18.6.2-RC

7 files changed, 70 insertions, 30 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index fdb84b9..187afff 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -2397,6 +2397,14 @@ for advice and a link to the system status web page.
                         [ERROR_MESSAGE]
                 </message>
         </alert>
+        <alert modal="true" name="QuickTimeOutOfDate">
+                <message name="message">
+                        Streaming video has been disabled because the version of 
+QuickTime installed on your system is out of date. 
+
+Visit http://www.apple.com/quicktime/ and download an update.
+                </message>
+        </alert>
         <alert modal="true" name="AvatarMoved">
                 <message name="message">
                         Your [TYPE] location is not currently available. [HELP] 
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
index 37a4e8e..03c07b9 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
@@ -675,7 +675,7 @@ texture:
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-                             left="76" mouse_opaque="true" name="Replace this texture:" v_pad="0"
+                             left="80" mouse_opaque="true" name="Replace this texture:" v_pad="0"
                              width="292">
                                 Replace this texture:
                         </text>
@@ -686,7 +686,7 @@ texture:
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-10" drop_shadow_visible="true" enabled="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-                             left="76" mouse_opaque="true" name="with content from this URL:" v_pad="0"
+                             left="80" mouse_opaque="true" name="with content from this URL:" v_pad="0"
                              width="292">
                                 with content from this URL:
                         </text>
@@ -712,7 +712,7 @@ Settings:
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-                             left="76" mouse_opaque="true" name="Music URL:" v_pad="0" width="364">
+                             left="80" mouse_opaque="true" name="Music URL:" v_pad="0" width="364">
                                 Music URL:
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-18"
@@ -736,8 +736,8 @@ Settings:
 Settings:
                         </text>
                         <radio_group bottom="-306" draw_border="true" enabled="true" follows="left|top" height="54"
-                             hidden="false" left="76" mouse_opaque="true" name="parcel_voice_channel"
-                             tab_stop="true" width="219">
+                             hidden="false" left="80" mouse_opaque="true" name="parcel_voice_channel"
+                             tab_stop="true" width="370">
                                 <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
                                      left="3" mouse_opaque="true" name="Estate" width="463">
                                         Use the Estate spatial channel
@@ -772,14 +772,14 @@ Settings:
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
                              left_delta="20" mouse_opaque="true" name="Only Allow"
                              v_pad="0" width="278">
-                                Restrict Access To:
+                                Block Access By:
                         </text>
                         <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall"
-                             height="16" hidden="false" initial_value="false" label="Residents who have given payment info to Linden Lab"
+                             height="16" hidden="false" initial_value="false" label="Residents who have not given payment info to Linden Lab"
                              left_delta="0" mouse_opaque="true" name="limit_payment" radio_style="false" width="278" 
                              tool_tip="Ban unidentified residents." />
                         <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall"
-                             height="16" hidden="false" initial_value="false" label="Age-verified adults"
+                             height="16" hidden="false" initial_value="false" label="Residents who are not age verified adults"
                              left_delta="0" mouse_opaque="true" name="limit_age_verified" radio_style="false" width="278"
                              tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information." />
                         <string name="estate_override">One ore more of these options is set at the estate level</string>
@@ -795,7 +795,7 @@ Settings:
                              mouse_opaque="true" name="PassCheck" radio_style="false" width="120" 
                              tool_tip="Allows temporary access to this parcel"/>
                         <combo_box allow_text_entry="false" bottom_delta="0" enabled="true" follows="left|top"
-                             height="16" hidden="false" left_delta="120" max_chars="20" mouse_opaque="true"
+                             height="16" hidden="false" left_delta="142" max_chars="20" mouse_opaque="true"
                              name="pass_combo" width="100">
                                 <combo_item name="Anyone" value="anyone">
                                         Anyone
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml
index 607a07b..bf0f15b 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml
@@ -40,8 +40,8 @@
              width="300">
                 Clicks:
         </text>
-        <button bottom_delta="-16" follows="left|top" height="18" label="Publish..." left="220"
-             name="classified_update_btn" width="80" />
+        <button bottom_delta="-16" follows="left|top" height="18" label="Publish..." left="208"
+             name="classified_update_btn" width="100" />
         <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
              height="20" label="Auto-renew each week" left="10" name="auto_renew_check"
              width="120" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml b/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml
index d05fde7..ca43c27 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml
@@ -19,7 +19,7 @@
                         Members &amp; Roles
                 </text>
                 <text bottom_delta="-36" font="SansSerifSmall" halign="left" height="32" left="0"
-                     name="static2" width="394">
+                     name="static2" width="400">
                         Group Members are assigned Roles with Abilities. These settings can 
 easily be customized, allowing for greater organization and flexibility.
                 </text>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml b/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
index 507649e..582e17d 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
@@ -27,7 +27,7 @@ vote on open proposals, and view old proposals.
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-36" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="32" left="7"
-             mouse_opaque="false" name="proposal_instructions" v_pad="0" width="350">
+             mouse_opaque="false" name="proposal_instructions" v_pad="0" width="380">
                 Double click on the proposal you would like to vote on or press Create Proposal to create a new proposal
         </text>
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
index 2c72b40..ec2f4e9 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
@@ -11,23 +11,36 @@
              height="16" hidden="false" initial_value="false" label="Run in a window"
              left="160" mouse_opaque="true" name="windowed mode" radio_style="false"
              width="256" />
-        <combo_box allow_text_entry="false" bottom="-47" enabled="false" follows="left|top"
+             
+             <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-43"
+             embedded_items="false" enabled="false" follows="left|top"
+             font="SansSerifSmall" height="20" hidden="false" hide_border="true"
+             hide_scrollbar="true" left="160" max_length="65535"
+             mouse_opaque="true" name="voice_chat_description" width="350" tab_stop="false"
+             word_wrap="true">If unchecked viewer will display full screen when logged in.</text_editor>
+<!--    <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-47" drop_shadow_visible="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="20" hidden="false"
+             left="160" mouse_opaque="true" name="full_screen_text" v_pad="0" width="256">
+                Viewer will display full screen when logged in.
+        </text> -->
+        <combo_box allow_text_entry="false" bottom="-67" enabled="false" follows="left|top"
              height="18" hidden="false" left="160" max_chars="20" mouse_opaque="true"
              name="fullscreen combo" width="160" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-87" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
              left="10" mouse_opaque="true" name="Fullscreen Aspect Ratio:" v_pad="0"
              width="150">
                 Fullscreen Aspect Ratio:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-77" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-102" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
              left="10" mouse_opaque="true" name="(width / height)" v_pad="0" width="128">
                 (width / height)
         </text>
-        <combo_box allow_text_entry="true" bottom="-66" enabled="true" follows="left|top"
+        <combo_box allow_text_entry="true" bottom="-91" enabled="true" follows="left|top"
              height="16" hidden="false" left="160" max_chars="100" mouse_opaque="true"
              name="aspect_ratio" width="160">
                 <combo_item type="string" length="1" enabled="true" name="4:3(StandardCRT)" value="1.333333">
@@ -40,43 +53,43 @@
                         16:9 (Widescreen)
                 </combo_item>
         </combo_box>
-        <check_box bottom="-85" control_name="FullScreenAutoDetectAspectRatio" enabled="true"
+        <check_box bottom="-110" control_name="FullScreenAutoDetectAspectRatio" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
              initial_value="false" label="Auto detect" left="160" mouse_opaque="true"
              name="aspect_auto_detect" radio_style="false" width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-125" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
              left="10" mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
                 UI Size:
         </text>
-        <slider bottom="-102" can_edit_text="true" control_name="UIScaleFactor"
+        <slider bottom="-127" can_edit_text="true" control_name="UIScaleFactor"
              decimal_digits="3" enabled="true" height="16" hidden="false"
              increment="0.025" initial_val="1" left="160" max_val="1.4" min_val="0.75"
              mouse_opaque="true" name="UI Scale" show_text="true" value="1" width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-138" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-163" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
              left="222" mouse_opaque="true" name="(meters, lower is faster)" v_pad="0"
              width="180">
                 (meters, lower is faster)
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-166" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-191" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
              left="10" mouse_opaque="true" name="text2" v_pad="0" width="128">
                 Display Options:
         </text>
-        <check_box bottom="-123" control_name="UIAutoScale" enabled="true" follows="left|top"
+        <check_box bottom="-148" control_name="UIAutoScale" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" hidden="false" initial_value="false"
              label="Use resolution independent scale" left="160" mouse_opaque="true"
              name="ui_auto_scale" radio_style="false" width="256" />
-        <spinner bottom="-142" control_name="RenderFarClip" decimal_digits="0" enabled="true"
+        <spinner bottom="-167" control_name="RenderFarClip" decimal_digits="0" enabled="true"
              follows="left|top" height="16" hidden="false" increment="32"
              initial_val="160" label="Draw Distance:" label_width="150" left="10"
              max_val="512" min_val="64" mouse_opaque="true" name="draw_distance"
              width="202" />
-        <check_box bottom="-170" control_name="FirstPersonAvatarVisible" enabled="true"
+        <check_box bottom="-195" control_name="FirstPersonAvatarVisible" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
              initial_value="false" label="Show Avatar in Mouselook" left="160"
              mouse_opaque="true" name="avfp" radio_style="false"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml
index fa1fffd..1b7f73e 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml
@@ -12,23 +12,42 @@
              halign="center" height="22" hidden="false"
              label="Clear Now" left="140" mouse_opaque="true"
              name="clear_cache" scale_image="true" width="85" />
-
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
              left="12" mouse_opaque="false" name="cookie_label" v_pad="0" width="128">
                 Cookies:
         </text>
-
         <check_box bottom="-65" control_name="CookiesEnabled" enabled="true" follows="left|top" font="SansSerifSmall"
              height="16" hidden="false" initial_value="false" label="Accept cookies from sites"
              left="140" mouse_opaque="true" name="cookies_enabled" radio_style="false"
              width="256" /> 
-             
         <button bottom="-95" enabled="true" follows="left|bottom" font="SansSerif"
              halign="center" height="22" hidden="false"
              label="Clear Now" left="140" mouse_opaque="true"
              name="clear_cookies" scale_image="true" width="85" />
-
-
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
+             left="12" mouse_opaque="false" name="proxy_label" v_pad="0" width="128">
+                Web Proxy:
+        </text>
+        <check_box bottom="-130" control_name="BrowserProxyEnabled" enabled="true" follows="left|top" font="SansSerifSmall"
+             height="16" hidden="false" initial_value="false" label="Enable Web Proxy"
+             left="140" mouse_opaque="true" name="web_proxy_enabled" radio_style="false"
+             width="256" /> 
+        <text type="string" length="1" bottom="-150" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
+             left="140" mouse_opaque="false" name="proxy_text_label" v_pad="0" width="128">
+                Address:
+        </text>
+        <line_editor bottom="-156" enabled="true" follows="left|top" font="SansSerif"
+             height="20" left="178" name="web_proxy_editor"     tool_tip="The name or IP address of the proxy you would like to use"
+             width="140" />                   
+        <spinner bottom="-180" control_name="BrowserProxyPort" decimal_digits="0"
+             enabled="true" follows="left|top" height="16" hidden="false"
+             increment="1" initial_val="80" label="Port Number:"
+             label_width="75" left="140" max_val="12000" min_val="10" mouse_opaque="true"
+             name="web_proxy_port" width="140"/>
 </panel>