Second Life viewer sources 1.21.0-RC

4 files changed, 42 insertions, 10 deletions

diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
index b9c3755..d7a6540 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
@@ -227,6 +227,10 @@
                         <string name="sale_pending_text">

                                 (Sale Pending)

                         </string>

+                        <string name="no_selection_text">

+                        No parcel selected.

+Go to World menu > About Land or select another parcel to show its details.

+                        </string>

                 </panel>

                 <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"

                      height="333" label="Covenant" left="0" mouse_opaque="true"

@@ -310,7 +314,7 @@
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

                              bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"

                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"

-                             mouse_opaque="true" name="parcel_object_bonus" v_pad="0" visible="fakse"

+                             mouse_opaque="true" name="parcel_object_bonus" v_pad="0" visible="false"

                              width="364">

                                 Region Object Bonus Factor: [BONUS]

                         </text>

@@ -454,7 +458,7 @@
                              halign="center" height="16" label="Return objects..."

                              label_selected="Return objects..." left="220" mouse_opaque="true"

                              name="Return objects..." width="164" />

-                        <name_list allow_calling_card_drop="false" background_visible="false" bottom="-329"

+                        <name_list allow_calling_card_drop="false" background_visible="true" bottom="-329"

                              column_padding="0" draw_border="true" draw_heading="true"

                              draw_stripes="true" enabled="true" 

                              follows="left|top|right|bottom" height="117" left="4" mouse_opaque="true"

@@ -463,6 +467,7 @@
                                 <column name="online_status" width="-1" />

                                 <column name="name" dynamicwidth="true" label="Name" />

                                 <column name="count" label="Count" width="70" />

+                                <column label="Most Recent" width="160" />

                         </name_list>

                 </panel>

                 <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"

@@ -819,7 +824,7 @@ Options:
                              tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information."

                              width="278" />

                         <string name="estate_override">

-                                One ore more of these options is set at the estate level

+                                One or more of these options is set at the estate level

                         </string>

                         <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"

                              height="16" initial_value="false" label="Allow Group Access: [GROUP]"

diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml
index f7e230f..fa7db4e 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml
@@ -11,6 +11,9 @@
              mouse_opaque="true" name="running" radio_style="false" width="100" />

         <panel bottom="-524" enabled="true" follows="left|top|right|bottom" height="506"

              left="1" name="script ed panel" width="497" />

+        <check_box bottom="-545" enabled="false" follows="left|bottom" font="SansSerif"

+             height="18" hidden="false" initial_value="true" label="Mono" left="82"

+             mouse_opaque="true" name="mono" radio_style="false" width="100" />

         <string name="not_allowed">

                 You are not allowed to view this script.

         </string>

diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml
index 0eca4ac..022065e 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml
@@ -5,7 +5,7 @@
              embedded_items="false" enabled="true" follows="left|top|right|bottom"

              font="Monospace" height="376" ignore_tab="false" left="4"

              max_length="65536" mouse_opaque="true" name="Script Editor" width="492"

-             word_wrap="true">

+             word_wrap="true" show_line_numbers="true">

                 Loading...

         </text_editor>

         <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"

diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml
index cd453fa..63e1be2 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml
@@ -3,7 +3,7 @@
      can_resize="false" follows="left|top" height="550" 

      left="308" min_height="100" min_width="100" mouse_opaque="true"

      name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""

-     width="272">

+     short_title="Build" width="272">

 

 <!-- Main floater tabs -->

 

@@ -278,6 +278,15 @@
                         Large

                 </combo_item>

         </combo_box>

+        <volume_slider bottom_delta="-19" follows="left|top" height="16" hidden="false" increment="0.1"

+         initial_val="0.00" left="176" max_val="2.0" min_val="-1.0"

+             mouse_opaque="true" name="slider force" width="70" />      

+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom_delta="4" drop_shadow_visible="true" enabled="true" follows="left|top"

+             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"

+             left="126" mouse_opaque="true" name="Strength:" v_pad="0" width="128">

+                  Strength:

+        </text>    

         <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="center"

              height="16" label="Apply to selection" label_selected="Apply to selection"

              left="118" mouse_opaque="true" name="button apply to selection"

@@ -417,13 +426,13 @@
                              name="checkbox for sale" width="78" />

                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

                              bottom_delta="0" drop_shadow_visible="true" follows="left|top"

-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="100"

-                             mouse_opaque="true" name="Price:  L$" v_pad="0" width="56">

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="90"

+                             mouse_opaque="true" name="Cost" v_pad="0" width="78">

                                 Price:  L$

                         </text>

                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"

-                             follows="left|top|right" font="SansSerifSmall" height="16" left_delta="56"

-                             max_length="25" mouse_opaque="true" name="EdCost" width="84" />

+                             follows="left|top|right" font="SansSerifSmall" height="16" left_delta="80"

+                             max_length="25" mouse_opaque="true" name="Edit Cost" width="75" />

                         <radio_group bottom="-286" draw_border="false" follows="left|top|right" height="16"

                              left="42" mouse_opaque="true" name="sale type" width="218">

                                 <radio_item bottom="-16" follows="left|top" height="16" left="0" mouse_opaque="true"

@@ -537,6 +546,21 @@
                         <string name="text modify warning">

                                 Must select entire object to set permissions.

                         </string>

+                        <string name="Cost Default">

+                        Price:           L$

+                        </string>

+                        <string name="Cost Total">

+                        Total Price:  L$

+                        </string>

+                        <string name="Cost Per Unit">

+                        Price Per:     L$

+                        </string>

+                        <string name="Cost Mixed">

+                        Mixed Price

+                        </string>

+                        <string name="Sale Mixed">

+                        Mixed Sale

+                        </string>

                 </panel>

 

 <!-- Object sub-tab -->

@@ -1178,7 +1202,7 @@
                 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

                      bottom_delta="0" drop_shadow_visible="true" follows="left|top"

                      font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"

-                     mouse_opaque="true" name="label_area" v_pad="0" width="72">

+                     mouse_opaque="true" name="label_area" v_pad="0" width="128">

                         Area: [AREA] sq. m.

                 </text>

                 <button bottom_delta="-38" follows="left|top" font="SansSerif" halign="center"