Second Life viewer sources 1.20.9

6 files changed, 100 insertions, 78 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index e3d0dbf..08a316a 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -1077,7 +1077,7 @@ Your system contains a graphics card that is unknown to us at this time.
 This is often the case with new hardware we haven't had a chance to 
 test.  Second Life will most likely run properly, but you may need to 
 adjust your graphics settings to something more appropriate.
-(Edit->Preferences->Graphics).
+(Edit menu > Preferences > Graphics).
                 </message>
                 <ignore name="ignore">
                         Ignore unknown graphics card
diff --git a/linden/indra/newview/skins/xui/en-us/floater_critical.xml b/linden/indra/newview/skins/xui/en-us/floater_critical.xml
index 126a8ac..5ce1f5c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_critical.xml
@@ -2,19 +2,18 @@
 <floater can_close="false" can_drag_on_left="false" can_minimize="false"
      can_resize="false" height="500" min_height="100" min_width="100"
      name="modal container" title="" width="600">
-        <button bottom="-484" font="SansSerif" halign="center" height="20" label="Continue"
-             label_selected="Continue" left="376" mouse_opaque="true" name="Continue"
+        <button bottom="15" font="SansSerif" halign="center" height="20" label="Continue"
+             label_selected="Continue" left="370" mouse_opaque="true" name="Continue"
              width="100" />
-        <button bottom="-484" font="SansSerif" halign="center" height="20" label="Cancel"
+        <button bottom="15" font="SansSerif" halign="center" height="20" label="Cancel"
              label_selected="Cancel" left_delta="108" mouse_opaque="true" name="Cancel"
              width="100" />
-  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom="-31" drop_shadow_visible="true" follows="left|top" font="SansSerif" h_pad="0" halign="left" height="15" left="16" mouse_opaque="true" name="tos_title" v_pad="0" width="568">
-    Critical Message
-  </text>
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom="-77" drop_shadow_visible="true" follows="left|top" font="SansSerif" h_pad="0" halign="left" height="30" left="32" mouse_opaque="true" name="tos_heading" v_pad="0" width="552">
+        <!-- No title text here because our "critical message" is usually the
+        community standards. JC -->
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom="-35" drop_shadow_visible="true" follows="left|top" font="SansSerif" h_pad="0" halign="left" height="20" left="20" mouse_opaque="true" name="tos_heading" v_pad="0" width="552">
                 Please read the following message carefully.
         </text>
-        <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif" height="283" left="16" max_length="65536" mouse_opaque="true" text_readonly_color="255,255,255,255" bg_readonly_color="0, 30, 80, 200" name="tos_text" width="568" word_wrap="true">
+        <text_editor bottom="45" embedded_items="false" follows="left|top" font="SansSerif" left="20" max_length="65536" mouse_opaque="true" text_readonly_color="255,255,255,255" bg_readonly_color="0, 30, 80, 200" name="tos_text" right="-20" top="-45" word_wrap="true">
                 TOS_TEXT
         </text_editor>
 </floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
index 43f255c..dd7520c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -385,71 +385,94 @@ To buy direct, visit the land and click on the place name in the title bar.
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
                              mouse_opaque="true" name="result_text" v_pad="0" width="328" />
                 </panel>
-    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-                     label="Places" left="1" mouse_opaque="false"
-                     name="places_panel"
+                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+                     label="Places" left="1" mouse_opaque="false" name="places_panel"
                      width="778">
-      <string name="searching_text">Searching...</string>
-      <string name="not_found_text">None Found.</string>
-      <button bottom="-30" follows="top|left" font="SansSerifSmall" height="20"
-                                label="Back"
-                                left="10"
-                                name="back_btn" width="70" />
-      <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-                                label="Forward" left_delta="75"
-                                name="forward_btn" width="70" />
-      <line_editor bevel_style="in"
-                                                border_style="line"
-                                                border_thickness="1"
-                                                bottom_delta="0"
-                                                enabled="true"
-                                                follows="top|left|right"
-                                                font="SansSerif"
-                                                handle_edit_keys_directly="false"
-                                                commit_on_focus_lost="false"
-                                                height="20"
-                                                hidden="false"
-                                                label="Search"
-                                                left_delta="80"
-                                                width="180"
-                                                max_length="254"
-                                                mouse_opaque="true"
-                                                name="search_editor"
-                                                select_all_on_focus_received="false"
-                                                select_on_focus="false"
-                                                tab_group="1"
-                                                tool_tip="Search Second Life" />
-      <button follows="top|right" font="SansSerif" height="20"
-                                label="Search"
-                                left_delta="185"
-                                bottom_delta="0"
-                                name="search_btn" width="70" />
-      <check_box bottom_delta="0"
-                                control_name="ShowMatureFindAll" follows="right|top"
+                        <string name="searching_text">
+                                Searching...
+                        </string>
+                        <string name="not_found_text">
+                                None Found.
+                        </string>
+                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+                             height="20" label="Next &gt;" label_selected="Next &gt;"
+                             mouse_opaque="true" name="Next &gt;" right="344" width="80" />
+                        <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
+                             height="20" label="&lt; Prev" label_selected="&lt; Prev"
+                             mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+                             name="find" v_pad="0" width="50">
+                                Find:
+                        </text>
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+                             follows="left|top" font="SansSerif" height="18" left_delta="38"
+                             max_length="63" mouse_opaque="true" name="name" width="128" />
+                        <check_box bottom_delta="-18" control_name="ShowMatureSims" follows="left|top"
                              font="SansSerifSmall" height="16" initial_value="false"
-                             label="Include Mature content"
-                             left_delta="133"
-                             name="mature_check"
-                             width="156" />
-      <web_browser name="places_browser"
-                                bottom="25"
-                                follows="top|left|bottom|right"
-                                font="SansSerifSmall"
-                                left="10"
-                                right="-10"
-                                top="-40" />
-      <text bottom="5"
-                                follows="bottom|left"
-                                halign="left"
-                                left="10"
-                                width="150"
-                                name="status_text"
-                                height="16" />
-      <string name="loading_text">Loading...</string>
-      <string name="done_text">Done</string>
-      <string name="redirect_404_url">http://secondlife.com/app/search/notfound.html</string>
-      <string name="default_search_page">"http://secondlife.com/app/search/index_places.php?"</string>
-    </panel>
+                             label="Include parcels with Mature content" left_delta="0"
+                             mouse_opaque="true" name="incmature" width="204" />
+                        <combo_box allow_text_entry="false" bottom="-24" follows="left|top" height="18" left="182"
+                             max_chars="20" mouse_opaque="true" name="Category" width="128">
+                                <combo_item name="AnyCategory" value="any">
+                                        Any Category
+                                </combo_item>
+                                <combo_item name="LindenLocation" value="linden">
+                                        Linden Location
+                                </combo_item>
+                                <combo_item name="Adult" value="adult">
+                                        Adult
+                                </combo_item>
+                                <combo_item name="Arts&amp;Culture" value="arts">
+                                        Arts &amp; Culture
+                                </combo_item>
+                                <combo_item name="Business" value="store">
+                                        Business
+                                </combo_item>
+                                <combo_item name="Educational" value="educational">
+                                        Educational
+                                </combo_item>
+                                <combo_item name="Gaming" value="game">
+                                        Gaming
+                                </combo_item>
+                                <combo_item name="Hangout" value="gather">
+                                        Hangout
+                                </combo_item>
+                                <combo_item name="NewcomerFriendly" value="newcomer">
+                                        Newcomer Friendly
+                                </combo_item>
+                                <combo_item name="Parks&amp;Nature" value="park">
+                                        Parks &amp; Nature
+                                </combo_item>
+                                <combo_item name="Residential" value="home">
+                                        Residential
+                                </combo_item>
+                                <combo_item name="Shopping" value="shopping">
+                                        Shopping
+                                </combo_item>
+                                <combo_item name="Other" value="other">
+                                        Other
+                                </combo_item>
+                        </combo_box>
+                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
+                             label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
+                             name="Search" width="70" />
+                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
+                             draw_heading="true" fg_disable_color="1, 1, 1, 1"
+                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
+                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+                             multi_select="false" name="results" search_column="2" width="339">
+                                <column label="" name="icon" width="24" />
+                                <column label="" name="type" width="-1" />
+                                <column dynamicwidth="true" label="Name" name="name" />
+                                <column label="Traffic" name="dwell" width="75" />
+                        </scroll_list>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+                             mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+                </panel>
     <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="People" left="1" mouse_opaque="false" name="people_panel"
                      width="778">
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
index 9ccfedb..6606980 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
@@ -72,7 +72,7 @@
                              select_all_on_focus_received="false" select_on_focus="false" tab_group="1"

                              width="106" />

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

-                             halign="right" height="20" label="Send" left="116" mouse_opaque="true"

+                             halign="center" height="20" label="Send" left="116" mouse_opaque="true"

                              name="send_btn" scale_image="true" width="60" />

                 </layout_panel>

                 <layout_panel auto_resize="false" bottom="0" can_resize="true"

diff --git a/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml b/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
index c549e29..a5d25a4 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
@@ -2,9 +2,9 @@
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
      can_resize="false" height="485" min_height="485" min_width="450"
      name="sell land" title="Sell Land" width="450">
-        <texture_picker bottom_delta="-155" enabled="false" follows="top|left" height="135" left="244"
+        <texture_picker bottom_delta="-175" enabled="false" follows="top|left" height="135" left="244"
              name="info_image" right="424" width="180" />
-        <text bottom_delta="119" follows="top|left" font="SansSerifSmall" left="16"
+        <text bottom_delta="144" follows="top|left" font="SansSerifSmall" left="16"
              name="info_parcel_label"  width="48">
                 Parcel:
         </text>
@@ -20,11 +20,11 @@
              name="info_size" right="-20" >
                 [AREA] sq. m.
         </text>
-        <text bottom_delta="-64" follows="top|left" font="SansSerifHuge" height="24"
+        <text bottom_delta="-94" follows="top|left" font="SansSerifHuge" height="24"
              left="16" name="info_action" text_color="white" width="200">
                 To sell this parcel:
         </text>
-        <icon bottom_delta="-96" follows="top|left" height="64" image_name="badge_note.j2c"
+        <icon bottom_delta="-66" follows="top|left" height="64" image_name="badge_note.j2c"
              left="0" name="step_price" width="64" />
         <text bottom_delta="38" follows="top|left" height="16" left="72" name="price_label"
              right="-20" font="SansSerifBig" >
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml b/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
index 393ce42..fa172aa 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
@@ -92,7 +92,7 @@ regions in the estate.
         <button bottom_delta="3" follows="left|top" font="SansSerifSmall" height="18" label="?"
              name="estate_manager_help" right="470" width="18" />
         <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
-             right="470" width="200" />
+             height="60" right="470" width="200" />
         <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true"
              name="estate_manager_name_list" width="200" />
         <button bottom_delta="-26" enabled="true" follows="left|top" height="20"