18 files changed, 506 insertions, 317 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index 39d1728..e3d0dbf 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -1032,7 +1032,7 @@ If you continue to have problems, please visit: http://www.secondlife.com/suppor
 MINSPECS
 Do you wish to visit [_URL] for more information?
                 </message>
-                <ignore message="ignore">
+                <ignore name="ignore">
                         Ignore unsupported hardware
                 </ignore>
                 <option name="Yes">
@@ -1319,8 +1319,7 @@ really want to offer this item?
         </alert>
         <alert modal="true" name="NoItems">
                 <message name="message">
-                        You do not have permission to transfer
-                        the selected items.
+                        You do not have permission to transfer the selected items.
                 </message>
         </alert>
         <alert modal="true" name="CannotCopyCountItems">
@@ -2465,10 +2464,12 @@ You have been moved into a nearby region.
         </alert>
         <alert modal="true" name="ClothingLoading">
                 <message name="message">
-                        Your clothing is still downloading.
-You can use the world normally, and other users
-will see you correctly.
+                        Your clothing is still downloading. 
+You can use [SECOND_LIFE] normally and other users will see you correctly.
                 </message>
+                <ignore name="ignore">
+                        When clothing is taking a long time to download
+                </ignore>
         </alert>
         <alert modal="true" name="FirstRun">
                 <message name="message">
@@ -3547,6 +3548,34 @@ Publish this classified now for L$[AMOUNT]?
                         Cancel
                 </option>
         </alert>
+  <alert name="SetClassifiedMature">
+    <message name="message">
+Does this classified contain Mature content?
+    </message>
+    <option name="Mature">
+      Yes
+    </option>
+    <option name="Not Mature">
+      No
+    </option>
+    <option name="Cancel">
+      Cancel
+    </option>
+  </alert>
+  <alert name="SetGroupMature">
+    <message name="message">
+Does this group contain Mature content?
+    </message>
+    <option name="Mature">
+      Yes
+    </option>
+    <option name="Not Mature">
+      No
+    </option>
+    <option name="Cancel">
+      Cancel
+    </option>
+  </alert>
         <alert name="ConfirmRestart" title="Confirm restart">
                 <message name="message">
                         Do you really want to restart this region in 2 minutes?
@@ -4951,5 +4980,10 @@ Would you like to visit the Second Life website to set this up?
                         https://secondlife.com/account/
                 </url>
         </alert>
+        <alert modal="true" name="MissingString">
+                <message name="message">
+                        The string [STRING_NAME] is missing from strings.xml
+                </message>
+        </alert>
 </alerts>
 
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 7714d67..43f255c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -65,7 +65,8 @@
                         <string name="redirect_404_url">
                                 http://secondlife.com/app/search/notfound.html
                         </string>
-                </panel>
+      <string name="default_search_page">"http://secondlife.com/app/search/index.php?"</string>
+    </panel>
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="Classifieds" left="1" left_delta="68" mouse_opaque="false"
                      name="classified_panel" width="778">
@@ -272,50 +273,37 @@
                              mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
                 </panel>
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-                     label="Popular Places" left="1" mouse_opaque="false" name="popular_panel"
+                     label="Showcase" left="1" mouse_opaque="false" name="showcase_panel"
                      width="778">
-                        <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" />
-                        <check_box bottom="-22" control_name="FindPlacesPictures" follows="left|top"
-                             font="SansSerifSmall" height="16" initial_value="true"
-                             label="Only show places with pictures" left="24" mouse_opaque="true"
-                             name="incpictures" width="200" />
-                        <check_box bottom_delta="-16" control_name="ShowMatureSims" follows="left|top"
-                             font="SansSerifSmall" height="16" initial_value="false"
-                             label="Include parcels with Restricted Content" left="24"
-                             mouse_opaque="true" name="incmature" width="204" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-38" drop_shadow_visible="true" follows="right|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="32" left_delta="326"
-                             mouse_opaque="true"
-                             name="These are the most popular places in the world, as measured by traffic,         the amount of time people spend there."
-                             v_pad="0" width="406">
-                                These are the most popular places in the world, as measured by traffic,
-the amount of time people spend there.
-                        </text>
-                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
-                             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="70" />
-                        </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>
+        <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" />
+        <!-- No mature content checkbox, showcase is all PG -->
+        <web_browser name="showcase_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/showcase/index.php?"</string>
+    </panel>
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="Land Sales" left="1" mouse_opaque="false" name="land_sales_panel"
                      width="778">
@@ -397,93 +385,72 @@ 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="-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"
+      <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"
                              font="SansSerifSmall" height="16" initial_value="false"
-                             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="true" bottom="-513" column_padding="0" draw_border="true"
-                             draw_heading="true" 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="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>
+    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="People" left="1" mouse_opaque="false" name="people_panel"
                      width="778">
                         <string name="searching_text">
@@ -495,128 +462,99 @@ To buy direct, visit the land and click on the place name in the title bar.
                         <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="330" width="80" />
-                        <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
+      <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="244" width="80" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <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"
+        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="200" />
-                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
+      <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
                              name="Search" width="70" />
-                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
+      <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
+                             draw_heading="true"
                              follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="326">
-                                <column label="" name="icon" width="24" />
-                                <column label="" name="type" width="-1" />
-                                <column label="Name" name="name" width="274" />
-                        </scroll_list>
+        <column label="" name="icon" width="24" />
+        <column label="" name="type" width="-1" />
+        <column label="Name" name="name" width="274" />
+      </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="Groups" left="1" mouse_opaque="false" name="groups_panel"
+    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+                     label="Groups" left="1" mouse_opaque="false"
+                     name="groups_panel"
                      width="778">
-                        <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="200" />
-                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
-                             label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
-                             name="Search" width="70" />
-                        <check_box bottom_delta="-16" control_name="ShowMatureGroups" follows="left|top"
+      <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"
                              font="SansSerifSmall" height="16" initial_value="false"
-                             label="Include Mature groups" left="42" mouse_opaque="true"
-                             name="incmature" width="204" />
-                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
-                             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" sort="score" sort_ascending="false" width="24" />
-                                <column label="" name="type" width="-1" />
-                                <column dynamicwidth="true" label="Name" name="name" />
-                                <column halign="left" label="Members" name="members" sort_ascending="false" width="100" />
-                                <column label="" name="score" width="-1" />
-                        </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="All (old)" left="1" mouse_opaque="false" name="find_all_old_panel"
-                     width="778">
-                        <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="&lt; Prev" label_selected="&lt; Prev" left="80"
-                             mouse_opaque="true" name="&lt; Prev" width="60" />
-                        <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;" width="60" />
-                        <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" />
-                        <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" />
-                        <check_box bottom="-22" control_name="ShowMatureFindAll" follows="left|top"
-                             font="SansSerifSmall" height="16" initial_value="false"
-                             label="Include Mature content" left_delta="78" mouse_opaque="true"
-                             name="incmature" width="156" />
-                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="false" 
-                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
-                             multi_select="false" name="results" search_column="1" width="339">
-                                <column label="" name="icon" width="24" />
-                                <column label="Name" name="name" width="235" />
-                                <column label="Price" name="price" width="90" />
-                                <column label="Time (PT)" name="date" width="90" />
-                                <column label="Time" name="time" width="-1" />
-                                <column label="Traffic" name="dwell" width="90" />
-                                <column label="Area" name="area" width="90" />
-                                <column label="L$/sq.m" name="per_meter" width="90" />
-                                <column label="Online" name="online" width="90" />
-                                <column label="Members" name="members" width="90" />
-                        </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>
+                             label="Include Mature content"
+                             left_delta="133"
+                             name="mature_check"
+                             width="156" />
+      <web_browser name="groups_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_groups.php?"</string>
+    </panel>
         </tab_container>
         <panel bottom="-560" follows="right|top" height="470" left="340"
              name="classified_details_panel" width="440" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_im.xml b/linden/indra/newview/skins/xui/en-us/floater_im.xml
index caf54e3..11c839c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_im.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_im.xml
@@ -16,6 +16,10 @@
         <string name="invite_message">
                 Click the [BUTTON NAME] button to accept/connect to this voice chat.
         </string>
+        <string name="muted_message">
+                [FIRST] [LAST] is muted.
+        </string>
+
         <string name="generic_request_error">
                 Error making request, please try again later.
         </string>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_joystick.xml b/linden/indra/newview/skins/xui/en-us/floater_joystick.xml
index 18f39dd..126bc7b 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_joystick.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_joystick.xml
@@ -67,7 +67,7 @@
         <text bottom="-294" left="20" width="94" halign="right" name="YDeadZone">Y Dead Zone</text>
         <spinner bottom="-294" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone2" name="AvatarAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
         <spinner bottom="-294" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone2" name="BuildAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-        <spinner bottom="-294" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone2" ame="FlycamAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+        <spinner bottom="-294" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone2" name="FlycamAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
 
         <text bottom="-314" left="20" width="94" halign="right" name="ZDeadZone">Z Dead Zone</text>
         <spinner bottom="-314" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone0" name="AvatarAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_script_debug.xml b/linden/indra/newview/skins/xui/en-us/floater_script_debug.xml
index f9d555d..2abd503 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_script_debug.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_script_debug.xml
@@ -2,7 +2,7 @@
 <multi_floater bottom="-463" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="true" height="233" left="337" min_height="100" min_width="100"
      mouse_opaque="true" name="script debug floater"
-     rect_control="FloaterScriptDebugRect" title="Script Errors/Warning"
+     rect_control="FloaterScriptDebugRect" title="Script Warning/Error"
      width="450">
         <tab_container border="false" bottom="-233" follows="left|top|right|bottom" height="217"
              left="1" mouse_opaque="false" name="Preview Tabs" tab_position="bottom"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml
index 3966ac6..1346f7c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml
@@ -18,13 +18,13 @@
                         Save snapshot to hard drive
                 </radio_item>
         </radio_group>
-        <text bottom="-240" follows="left|top" height="25" left="10" name="file_size_label"
+        <text bottom="-236" follows="left|top" height="25" left="10" name="file_size_label"
              width="195">
                 File size: [SIZE] KB
         </text>
-        <button bottom="-250" follows="left|top" height="20" label="Refresh Snapshot" left="10"
+        <button bottom="-246" follows="left|top" height="20" label="Refresh Snapshot" left="10"
              name="new_snapshot_btn" width="195" />
-        <button bottom_delta="-20" follows="left|top" height="20" label="Send" left="10"
+        <button bottom_delta="-22" follows="left|top" height="20" label="Send" left="10"
              name="send_btn" width="105" />
         <button bottom_delta="0" follows="left|top" height="20" label="Upload (L$10)" left="10"
              name="upload_btn" width="105" />
@@ -142,7 +142,7 @@
              name="keep_open_check" />
         <check_box bottom_delta="-20" follows="left|top" label="Freeze frame (fullscreen preview)"
              left="10" name="freeze_frame_check" />
-        <check_box bottom_delta="-20" follows="left|top" label="Auto-snapshot" left="10"
+        <check_box bottom_delta="-20" follows="left|top" label="Auto-snapshot" left="20"
              name="auto_snapshot_check" />
         <string name="unknown">
                 unknown
diff --git a/linden/indra/newview/skins/xui/en-us/floater_world_map.xml b/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
index 4e26986..0ebab6f 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
@@ -98,51 +98,39 @@
              font="SansSerifSmall" height="16" initial_value="false" label=""
              left_delta="70" mouse_opaque="true" name="telehubchk" width="55" />
         <icon bottom="-76" color="1, 1, 1, 1" follows="top|right" height="16"
-             image_name="icon_popular.tga" left="1123" mouse_opaque="true"
-             name="popular" width="16" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-76" drop_shadow_visible="true" follows="top|right"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
-             mouse_opaque="true" name="popular_label" v_pad="0" width="145">
-                Popular
-        </text>
-        <check_box bottom="-76" control_name="MapShowPopular" follows="top|right"
-             font="SansSerifSmall" height="16" initial_value="false" label=""
-             left_delta="80" mouse_opaque="true" name="popular_chk" width="55" />
-        <icon bottom="-96" color="1, 1, 1, 1" follows="top|right" height="16"
              image_name="icon_for_sale.tga" left="1123" mouse_opaque="true"
              name="landforsale" width="16" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-96" drop_shadow_visible="true" follows="top|right"
+             bottom="-76" drop_shadow_visible="true" follows="top|right"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
              mouse_opaque="true" name="land_for_sale_label2" v_pad="0" width="145">
                 Land For Sale
         </text>
-        <check_box bottom="-96" control_name="MapShowLandForSale" follows="top|right"
+        <check_box bottom="-76" control_name="MapShowLandForSale" follows="top|right"
              font="SansSerifSmall" height="16" initial_value="false" label=""
              left_delta="80" mouse_opaque="true" name="land_for_sale_chk" width="55" />
-        <icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-96" color="1, 1, 1, 1" follows="top|right" height="16"
              image_name="map_event.tga" left="1123" mouse_opaque="true" name="event"
              width="16" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-116" drop_shadow_visible="true" follows="top|right"
+             bottom="-96" drop_shadow_visible="true" follows="top|right"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
              mouse_opaque="true" name="events_label" v_pad="0" width="145">
                 Events
         </text>
-        <check_box bottom="-116" control_name="MapShowEvents" follows="top|right"
+        <check_box bottom="-96" control_name="MapShowEvents" follows="top|right"
              font="SansSerifSmall" height="16" initial_value="false" label=""
              left_delta="80" mouse_opaque="true" name="event_chk" width="55" />
-        <icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
              image_name="map_event_mature.tga" left="1123" mouse_opaque="true"
              name="events_mature_icon" width="16" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-136" drop_shadow_visible="true" follows="top|right"
+             bottom="-116" drop_shadow_visible="true" follows="top|right"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
              mouse_opaque="true" name="events_mature_label" v_pad="0" width="145">
                 Events (M)
         </text>
-        <check_box bottom="-136" control_name="ShowMatureEvents" follows="top|right"
+        <check_box bottom="-116" control_name="ShowMatureEvents" follows="top|right"
              font="SansSerifSmall" height="16" initial_value="true" label=""
              left_delta="80" mouse_opaque="true" name="event_mature_chk" width="55" />
         <icon bottom="-181" color="0.5, 0, 0, 1" follows="top|right" height="16"
diff --git a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
index cdba314..054f867 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
@@ -62,34 +62,6 @@
                 </menu_item_call>
                 <menu_item_separator bottom="-194" enabled="true" height="8" label="-----------" left="0"
                      mouse_opaque="true" name="separator4" width="243" />
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="117" label="Set Window Size" left="0" mouse_opaque="false"
-                     name="Set Window Size" opaque="true" tear_off="true" width="125">
-                        <menu_item_call bottom="-29" enabled="true" height="19" label="320x240" left="0"
-                             mouse_opaque="true" name="320x240" width="125">
-                                <on_click function="File.SetWindowSize" userdata="320,240" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-48" enabled="true" height="19" label="640x480" left="0"
-                             mouse_opaque="true" name="640x480" width="125">
-                                <on_click function="File.SetWindowSize" userdata="640,480" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-67" enabled="true" height="19" label="800x600" left="0"
-                             mouse_opaque="true" name="800x600" width="125">
-                                <on_click function="File.SetWindowSize" userdata="800,600" />
-                        </menu_item_call>
-                        <menu_item_separator bottom="-75" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator" width="125" />
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="720x480 (NTSC)" left="0"
-                             mouse_opaque="true" name="720x480 (NTSC)" width="125">
-                                <on_click function="File.SetWindowSize" userdata="720,480" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-113" enabled="true" height="19" label="768x576 (PAL)" left="0"
-                             mouse_opaque="true" name="768x576 (PAL)" width="125">
-                                <on_click function="File.SetWindowSize" userdata="768,576" />
-                        </menu_item_call>
-                </menu>
-                <menu_item_separator bottom="-240" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator5" width="243" />
                 <menu_item_call bottom="-259" enabled="true" height="19" label="Quit" left="0"
                      mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
                         <on_click function="File.Quit" userdata="" />
@@ -509,6 +481,7 @@
                 <menu_item_check bottom="-86" enabled="true" height="19" label="Fly" left="0"
                      mouse_opaque="true" name="Fly" shortcut="Home" width="185">
                         <on_click function="World.Fly" userdata="" />
+                        <on_enable function="World.EnableFly" />
                         <on_check control="FlyBtnState" />
                 </menu_item_check>
                 <menu_item_separator bottom="-94" enabled="true" height="8" label="-----------" left="0"
diff --git a/linden/indra/newview/skins/xui/en-us/mime_types.xml b/linden/indra/newview/skins/xui/en-us/mime_types.xml
index 2a77a8b..e2e6fb2 100644
--- a/linden/indra/newview/skins/xui/en-us/mime_types.xml
+++ b/linden/indra/newview/skins/xui/en-us/mime_types.xml
@@ -166,7 +166,7 @@
                 </widgettype>
         </mimetype>
         <mimetype name="image/*">
-                <label label="image2_label">
+                <label name="image2_label">
                         Image
                 </label>
                 <widgettype>
diff --git a/linden/indra/newview/skins/xui/en-us/notify.xml b/linden/indra/newview/skins/xui/en-us/notify.xml
index f0ba148..02aa57c 100644
--- a/linden/indra/newview/skins/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/xui/en-us/notify.xml
@@ -914,6 +914,21 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
                         Mute
                 </option>
         </notify>
+        <notify name="AutoUnmuteByIM" tip="false">
+                <message name="message">
+                        [FIRST] [LAST] was sent an instant message and has been automatically unmuted.
+                </message>
+        </notify>
+        <notify name="AutoUnmuteByMoney" tip="false">
+                <message name="message">
+                        [FIRST] [LAST] was given money and has been automatically unmuted.
+                </message>
+        </notify>
+        <notify name="AutoUnmuteByInventory" tip="false">
+                <message name="message">
+                        [FIRST] [LAST] was offered inventory and has been automatically unmuted.
+                </message>
+        </notify>
         <notify name="VoiceInviteGroup" tip="false" unique="true">
                 <message name="message">
                         [NAME] has joined a Voice Chat call with the group [GROUP]. 
@@ -1029,4 +1044,9 @@ Click Accept to join the chat or Decline to decline the invitation. Click Mute t
                         The region you have entered is running a different simulator version. Click this message for details.
                 </message>
         </notify>
+        <notify caution="true" name="UnableToOpenCommandURL" tip="true">
+                <message name="message">
+                        The URL you clicked cannot be opened from this web browser.
+                </message>
+        </notify>
 </notifications>
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 001d6d6..d378cb9 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
@@ -22,8 +22,18 @@
              name="classified_map_btn" width="80" />
         <combo_box bottom_delta="-27" follows="left|top" height="18" label="" left="10"
              name="classified_category_combo" right="150" />
-        <check_box bottom_delta="-1" follows="left|top" height="20" label="Mature" left="160"
-             name="classified_mature_check" width="80" />
+  <combo_box allow_text_entry="false" bottom_delta="-1" follows="left|top" height="20" 
+       label="" left="160" name="classified_mature_check" width="130" >
+    <combo_item name="select_mature" value="Select">
+      - Select Mature -
+    </combo_item>
+    <combo_item name="mature" value="Mature">
+      Mature Content
+    </combo_item>
+    <combo_item name="not_mature" value="Not Mature">
+      Not Mature Content
+    </combo_item>
+  </combo_box>
         <text bottom_delta="-25" follows="left|top"
              font="SansSerifSmall" height="18" left="10" name="classified_info_text"
              tool_tip="The more you choose to pay for your ad, the higher in the list it appears."
diff --git a/linden/indra/newview/skins/xui/en-us/panel_classified.xml b/linden/indra/newview/skins/xui/en-us/panel_classified.xml
index bc7a4d1..063a110 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_classified.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_classified.xml
@@ -22,10 +22,21 @@
              name="classified_map_btn" width="100" />
         <button bottom_delta="0" follows="left|top" height="20" label="Profile" left="230"
              name="classified_profile_btn" width="100" />
-        <check_box bottom="422" follows="left|top" height="20" label="Mature" left="30"
-             name="classified_mature_check"  width="80" />
-        <combo_box bottom="445" follows="left|top" height="18" label=""
-             left="20" name="classified_category_combo" right="150" />
+  <combo_box allow_text_entry="false" bottom="422" follows="left|top" height="20" left="30"
+         max_chars="20" mouse_opaque="true" name="classified_mature_check" width="130">
+    <combo_item name="select_mature" value="Select">
+      - Select Mature -
+    </combo_item>
+    <combo_item name="mature" value="Mature">
+      Mature Content
+    </combo_item>
+    <combo_item name="not_mature" value="Not Mature">
+      Not Mature Content
+    </combo_item>
+  </combo_box>
+        <combo_box bg_readonly_color="grey" bottom="445" follows="left|top" height="18" label=""
+             left="20" name="classified_category_combo" right="150"
+             text_readonly_color="white" />
         <button bottom="400" follows="left|top" height="20" label="Update" left="30"
              name="classified_update_btn" width="70" />
         <string name="ad_placed_paid">
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_general.xml b/linden/indra/newview/skins/xui/en-us/panel_group_general.xml
index 7332cdf..8103363 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_general.xml
@@ -83,11 +83,6 @@ Hover your mouse over the options for more help.
                      initial_value="true" label="Show in search" left="4" mouse_opaque="true"
                      name="show_in_group_list" radio_style="false"
                      tool_tip="Let people see this group in search results." width="95" />
-                <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-                     initial_value="false" label="Mature group" left_delta="0"
-                     mouse_opaque="true" name="mature" radio_style="false"
-                     tool_tip="Sets whether your group information is considered mature."
-                     visible="true" width="95" />
                 <check_box bottom_delta="-18" follows="right|top" font="SansSerifSmall" height="16"
                      initial_value="false" label="Open enrollment" left="4" mouse_opaque="true"
                      name="open_enrollement" radio_style="false"
@@ -106,6 +101,21 @@ Hover your mouse over the options for more help.
                      mouse_opaque="true" name="spin_enrollment_fee" right_delta="170"
                      tool_tip="New members must pay this fee to join the group when   Enrollment Fee is checked."
                      v_pad="0" width="65" />
+                <combo_box allow_text_entry="false" bottom_delta="-30" follows="left|top" height="20" left="6"
+                        max_chars="20" mouse_opaque="true" name="group_mature_check" 
+                        tool_tip="Sets whether your group information is considered mature."
+                        width="130">
+                        <combo_item name="select_mature" value="Select">
+                        - Select Mature -
+                        </combo_item>
+                        <combo_item name="mature" value="Mature">
+                        Mature Content
+                        </combo_item>
+                        <combo_item name="not_mature" value="Not Mature">
+                        Not Mature Content
+                        </combo_item>
+                </combo_box>
+
                 <panel background_opaque="false" border="false" bottom="-31" height="32" left="225"
                      name="title_container" width="160">
                         <text bottom="17" font="SansSerifSmall" left="0" name="active_title_label">
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml b/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml
index 7f0c0f7..0e5e84d 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml
@@ -24,8 +24,9 @@ the General tab.
              bottom_delta="-20" drop_shadow_visible="true" font="SansSerifSmall"
              h_pad="0" halign="left" height="16" left_delta="0" mouse_opaque="true"
              name="lbl2" v_pad="0" width="436">
-                Notices are kept for 30 days. Click the notice below you wish to view.
+                Notices are kept for 14 days. Click the notice below you wish to view.
 Click the &apos;Refresh&apos; button to check if new notices have been received.
+Notice lists are limited to 200 notices per group on a daily basis.
         </text>
         <scroll_list background_visible="true" bottom_delta="-137" column_padding="0"
              draw_border="true" draw_heading="true" enabled="true"
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 fbcb773..527309e 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
@@ -16,22 +16,48 @@
                 If unchecked, viewer will display full-screen when logged in.
         </text_editor>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-39" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+             mouse_opaque="true" name="WindowSizeLabel" v_pad="0" width="128">
+                Window Size:
+        </text>
+        <combo_box allow_text_entry="false" bottom="-67" enabled="true" follows="left|top"
+             height="18" left="185" max_chars="20" mouse_opaque="true"
+             name="windowsize combo" width="150">
+                <combo_item type="string" length="1" enabled="true" name="640x480" value="640 x 480">
+                        640x480
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="800x600" value="800 x 600">
+                        800x600 
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="720x480" value="720 x 480">
+                        720x480 (NTSC)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="768x576" value="768 x 576">
+                        768x576 (PAL)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="1024x768" value="1024 x 768">
+                        1024x768
+                </combo_item>
+
+        </combo_box>
+        <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"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="DisplayResLabel" v_pad="0" width="128">
                 Display Resolution:
         </text>
-        <combo_box allow_text_entry="false" bottom="-44" enabled="true" follows="left|top"
+        <combo_box allow_text_entry="false" bottom="-67" enabled="true" follows="left|top"
              height="18" left="185" max_chars="20" mouse_opaque="true"
              name="fullscreen combo" width="150" />
         <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="-39" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12"
              left="10" mouse_opaque="true" name="AspectRatioLabel1"
              tool_tip="width / height" v_pad="0" width="160">
                 Aspect Ratio:
         </text>
-        <combo_box allow_text_entry="true" bottom="-66" enabled="true" follows="left|top"
+        <combo_box allow_text_entry="true" bottom="-43" enabled="true" follows="left|top"
              height="16" left="185" max_chars="100" mouse_opaque="true"
              name="aspect_ratio" tool_tip="width / height" width="150">
                 <combo_item type="string" length="1" enabled="true" name="4:3(StandardCRT)" value="1.333333">
@@ -47,7 +73,7 @@
                         16:9 (Widescreen)
                 </combo_item>
         </combo_box>
-        <check_box bottom="-67" control_name="FullScreenAutoDetectAspectRatio" enabled="true"
+        <check_box bottom="-44" control_name="FullScreenAutoDetectAspectRatio" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Auto-detect ratio" left="358" mouse_opaque="true"
              name="aspect_auto_detect" radio_style="false" width="256" />
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 a32ca56..4d84e32 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
@@ -3,13 +3,13 @@
      height="408" label="Web" left="102" mouse_opaque="true" name="web"
      width="517">
         <radio_group bottom="-45" draw_border="false" follows="top|left" height="40" left="12"
-             name="use_external_browser"
-             tool_tip="Use outside web browser for help, web links, etc. Not recommended if running full screen."
-             width="480">
-                <radio_item bottom="-20" height="20" left="0" name="external" width="480">
+             name="use_external_browser" width="480">
+                <radio_item bottom="-20" height="20" left="0" name="external" width="480" 
+                  tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen.">
                         Use external web browser (Firefox, Safari, Internet Explorer)
                 </radio_item>
-                <radio_item bottom="-40" height="20" left="0" name="internal" width="480">
+                <radio_item bottom="-40" height="20" left="0" name="internal" width="480" 
+                  tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside Second Life.">
                         Use built-in web browser
                 </radio_item>
         </radio_group>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_general.xml b/linden/indra/newview/skins/xui/en-us/panel_region_general.xml
index fa12fca..af3cecf 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_general.xml
@@ -9,6 +9,14 @@
              name="region_text" width="400">
                 unknown
         </text>
+        <text bottom="-50" follows="left|top" font="SansSerif" height="20" left="10"
+             name="version_channel_text_lbl" width="100">
+                Version: 
+        </text>
+        <text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
+             name="version_channel_text" width="200">
+                unknown
+        </text>
         <check_box bottom_delta="-20" follows="left|top" height="20" label="Block Terraform"
              left="10" name="block_terraform_check" width="80" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
@@ -74,6 +82,6 @@
              label="Teleport Home All Users..." left="10" name="kick_all_btn" width="250" />
         <button bottom_delta="-40" follows="left|top" height="20"
              label="Send Message To Region..." left="10" name="im_btn" width="200" />
-        <button bottom="-50" follows="left|top" height="20" label="Manage Telehub..."
+        <button bottom="-70" follows="left|top" height="20" label="Manage Telehub..."
              left="250" name="manage_telehub_btn" width="150" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/strings.xml b/linden/indra/newview/skins/xui/en-us/strings.xml
new file mode 100644
index 0000000..9952d56
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/strings.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<!-- This file contains strings that used to be hardcoded in the source.

+     It is only for those strings which don't belong in a floater.

+     For example, the strings used in avatar chat bubbles, and strings 

+     that are returned from one component and may appear in many places-->

+<strings>

+        

+        <!-- Login -->

+        <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen.  Please wait.</string>

+        <string name="LoginAuthenticating">Authenticating</string>

+        <string name="LoginMaintenance">Performing account maintenance...</string>

+        <string name="LoginAttempt">Previous login attempt failed. Logging in, attempt [NUMBER]</string>

+        <string name="LoginPrecaching">Loading world...</string>

+        <string name="LoginInitializingBrowser">Initializing embedded web browser...</string>

+        <string name="LoginVerifyingCache">Verifying cache files (can take 60-90 seconds)...</string>

+        <string name="LoginProcessingResponse">Processing Response...</string>

+        <string name="LoginInitializingWorld">Initializing World...</string>

+        <string name="LoginDecodingImages">Decoding images...</string>

+        <string name="LoginInitializingQuicktime">Initializing QuickTime...</string>

+        <string name="LoginQuicktimeNotFound">QuickTime not found - unable to initialize.</string>

+        <string name="LoginQuicktimeOK">QuickTime initialized successfully.</string>

+        <string name="LoginWaitingForRegionHandshake">Waiting for region handshake...</string>

+        <string name="LoginConnectingToRegion">Connecting to region...</string>

+        <string name="LoginDownloadingClothing">Downloading clothing...</string>

+

+        

+        

+        <!-- Tooltip, llhoverview.cpp. Note: spaces at the end are intentional -->

+        <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->

+        <string name="TooltipNoName">(no name)</string> <!-- No name on an object -->

+        <string name="TooltipOwner">Owner:</string> <!-- Owner name follows -->

+        <string name="TooltipPublic">Public</string> <!-- Public permissions on an object -->

+        <string name="TooltipIsGroup">(Group)</string> <!-- The name before this text is that of a group -->

+        <string name="TooltipFlagScript">Script</string>

+        <string name="TooltipFlagPhysics">Physics</string>

+        <string name="TooltipFlagTouch">Touch</string>

+        <string name="TooltipFlagL$">L$</string>

+        <string name="TooltipFlagDropInventory">Drop Inventory</string>

+        <string name="TooltipFlagPhantom">Phantom</string>

+        <string name="TooltipFlagTemporary">Temporary</string>

+        <string name="TooltipFlagRightClickMenu">(Right-click for menu)</string>

+        <string name="TooltipFreeToCopy">Free to copy</string>

+        <string name="TooltipForSaleL$">For Sale: L$[AMOUNT]</string> <!-- L$ version -->

+        <string name="TooltipForSaleMsg">For Sale: [MESSAGE]</string> <!-- Message (RetrievingData) -->

+        <string name="TooltipFlagGroupBuild">Group Build</string>

+        <string name="TooltipFlagNoBuild">No Build</string>

+        <string name="TooltipFlagNoEdit">Group Build</string>

+        <string name="TooltipFlagNotSafe">Not Safe</string><!-- damage area -->

+        <string name="TooltipFlagNoFly">No Fly</string>

+        <string name="TooltipFlagGroupScripts">Group Scripts</string>

+        <string name="TooltipFlagNoScripts">No Scripts</string>

+        

+        <string name="TooltipLand">Land:</string>

+        

+        

+        <!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. -->

+        <string name="RetrievingData">Retrieving...</string>

+        

+        <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->

+        <string name="LoadingData">Loading...</string>

+        

+        

+        <!-- namecache -->

+        <!-- Avatar name: text shown for LLUUID::null -->

+        <string name="AvatarNameNobody">(nobody)</string>

+        

+        <!-- Avatar name: text shown while fetching name -->

+        <string name="AvatarNameWaiting">(waiting)</string>

+

+        <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->

+        <string name="AvatarNameHippos">(hippos)</string>

+        

+        <!-- Group name: text shown for LLUUID::null -->

+        <string name="GroupNameNone">(none)</string>

+        

+        <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->

+        <string name="AssetErrorNone">No error</string>

+        <string name="AssetErrorRequestFailed">Asset request: failed</string>

+        <string name="AssetErrorNonexistentFile">Asset request: non-existent file</string>

+        <string name="AssetErrorNotInDatabase">Asset request: asset not found in database</string>

+        <string name="AssetErrorEOF">End of file</string>

+        <string name="AssetErrorCannotOpenFile">Cannot open file</string>

+        <string name="AssetErrorFileNotFound">File not found</string>

+        <string name="AssetErrorTCPTimeout">File transfer timeout</string>

+        <string name="AssetErrorCircuitGone">Circuit gone</string>

+        <string name="AssetErrorUnknownStatus">Unknown status</string>

+        

+        <!-- llvoavatar. Displayed in the avatar's chat bubble -->

+        <string name="AvatarEditingApparance">(Editing Appearance)</string>

+        <string name="AvatarAway">Away</string>

+        <string name="AvatarBusy">Busy</string>

+        <string name="AvatarMuted">Muted</string>

+        

+        <!-- animations -->

+        <string name="anim_express_afraid">Afraid</string>

+        <string name="anim_express_anger">Angry</string>

+        <string name="anim_away">Away</string>

+        <string name="anim_backflip">Backflip</string>

+        <string name="anim_express_laugh">Belly Laugh</string>

+        <string name="anim_express_toothsmile">BigSmile</string>

+        <string name="anim_blowkiss">Blow Kiss</string>

+        <string name="anim_express_bored">Bored</string>

+        <string name="anim_bow">Bow</string>

+        <string name="anim_clap">Clap</string>

+        <string name="anim_courtbow">Court Bow</string>

+        <string name="anim_express_cry">Cry</string>

+        <string name="anim_dance1">Dance 1</string>

+        <string name="anim_dance2">Dance 2</string>

+        <string name="anim_dance3">Dance 3</string>

+        <string name="anim_dance4">Dance 4</string>

+        <string name="anim_dance5">Dance 5</string>

+        <string name="anim_dance6">Dance 6</string>

+        <string name="anim_dance7">Dance 7</string>

+        <string name="anim_dance8">Dance 8</string>

+        <string name="anim_express_disdain">Disdain</string>

+        <string name="anim_drink">Drink</string>

+        <string name="anim_express_embarrased">Embarrassed</string>

+        <string name="anim_angry_fingerwag">Finger Wag</string>

+        <string name="anim_fist_pump">Fist Pump</string>

+        <string name="anim_yoga_float">Floating Yoga</string>

+        <string name="anim_express_frown">Frown</string>

+        <string name="anim_impatient">Impatient</string>

+        <string name="anim_jumpforjoy">Jump For Joy</string>

+        <string name="anim_kissmybutt">Kiss My Butt</string>

+        <string name="anim_express_kiss">Kiss</string>

+        <string name="anim_laugh_short">Laugh</string>

+        <string name="anim_musclebeach">Muscle Beach</string>

+        <string name="anim_no_unhappy">No (Unhappy)</string>

+        <string name="anim_no_head">No</string>

+        <string name="anim_nyanya">Nya-nya-nya</string>

+        <string name="anim_punch_onetwo">One-Two Punch</string>

+        <string name="anim_express_open_mouth">Open Mouth</string>

+        <string name="anim_peace">Peace</string>

+        <string name="anim_point_you">Point at Other</string>

+        <string name="anim_point_me">Point at Self</string>

+        <string name="anim_punch_l">Punch Left</string>

+        <string name="anim_punch_r">Punch Right</string>

+        <string name="anim_rps_countdown">RPS count</string>

+        <string name="anim_rps_paper">RPS paper</string>

+        <string name="anim_rps_rock">RPS rock</string>

+        <string name="anim_rps_scissors">RPS scissors</string>

+        <string name="anim_express_repulsed">Repulsed</string>

+        <string name="anim_kick_roundhouse_r">Roundhouse Kick</string>

+        <string name="anim_express_sad">Sad</string>

+        <string name="anim_salute">Salute</string>

+        <string name="anim_shout">Shout</string>

+        <string name="anim_express_shrug">Shrug</string>

+        <string name="anim_express_smile">Smile</string>

+        <string name="anim_smoke_idle">Smoke Idle</string>

+        <string name="anim_smoke_inhale">Smoke Inhale</string>

+        <string name="anim_smoke_throw_down">Smoke Throw Down</string>

+        <string name="anim_express_surprise">Surprise</string>

+        <string name="anim_sword_strike_r">Sword Strike</string>

+        <string name="anim_angry_tantrum">Tantrum</string>

+        <string name="anim_express_tongue_out">TongueOut</string>

+        <string name="anim_hello">Wave</string>

+        <string name="anim_whisper">Whisper</string>

+        <string name="anim_whistle">Whistle</string>

+        <string name="anim_express_wink">Wink</string>

+        <string name="anim_wink_hollywood">Wink (Hollywood)</string>

+        <string name="anim_express_worry">Worry</string>

+        <string name="anim_yes_happy">Yes (Happy)</string>

+        <string name="anim_yes_head">Yes</string>

+        

+</strings>

+