Merge pull request #5097 from secondlife/release/2026.01

2026.01

35 files changed, 1768 insertions, 28 deletions

diff --git a/indra/newview/skins/default/textures/icon_auction.tga b/indra/newview/skins/default/textures/icon_auction.tga
new file mode 100644
index 0000000000..d121833b47
--- /dev/null
+++ b/indra/newview/skins/default/textures/icon_auction.tga
diff --git a/indra/newview/skins/default/textures/icon_event.tga b/indra/newview/skins/default/textures/icon_event.tga
new file mode 100644
index 0000000000..7805dbce60
--- /dev/null
+++ b/indra/newview/skins/default/textures/icon_event.tga
diff --git a/indra/newview/skins/default/textures/icon_event_adult.tga b/indra/newview/skins/default/textures/icon_event_adult.tga
new file mode 100644
index 0000000000..c344fb1e78
--- /dev/null
+++ b/indra/newview/skins/default/textures/icon_event_adult.tga
diff --git a/indra/newview/skins/default/textures/icon_event_mature.tga b/indra/newview/skins/default/textures/icon_event_mature.tga
new file mode 100644
index 0000000000..61c879bc92
--- /dev/null
+++ b/indra/newview/skins/default/textures/icon_event_mature.tga
diff --git a/indra/newview/skins/default/textures/icon_place.tga b/indra/newview/skins/default/textures/icon_place.tga
new file mode 100644
index 0000000000..2170c98499
--- /dev/null
+++ b/indra/newview/skins/default/textures/icon_place.tga
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index d650e7e791..ff5737ab49 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -837,8 +837,14 @@ with the same filename but different name
   <texture name="icon_avatar_online.tga" />
   <texture name="icon_diurnal.tga" />
   <texture name="icon_for_sale.tga" file_name="icons/Icon_For_Sale.png" />
+  <texture name="icon_auction.tga"/>
+  <texture name="icon_place.tga"/>
   <texture name="icon_top_pick.tga" />
 
+  <texture name="icon_event.tga"/>
+  <texture name="icon_event_adult.tga"/>
+  <texture name="icon_event_mature.tga" />
+
   <texture name="lag_status_critical.tga" />
   <texture name="lag_status_good.tga" />
   <texture name="lag_status_warning.tga" />
diff --git a/indra/newview/skins/default/xui/da/panel_status_bar.xml b/indra/newview/skins/default/xui/da/panel_status_bar.xml
index 6e7bdfc188..a976c3f17a 100644
--- a/indra/newview/skins/default/xui/da/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/da/panel_status_bar.xml
@@ -12,7 +12,7 @@
 	<panel.string name="bandwidth_tooltip">
 		Båndbredde
 	</panel.string>
-	<panel.string name="time">
+	<panel.string name="time_ampm">
 		[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
 	</panel.string>
 	<panel.string name="timeTooltip">
diff --git a/indra/newview/skins/default/xui/de/panel_status_bar.xml b/indra/newview/skins/default/xui/de/panel_status_bar.xml
index 0829814220..7e305fb16b 100644
--- a/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_status_bar.xml
@@ -6,7 +6,7 @@
 	<panel.string name="bandwidth_tooltip">
 		Bandbreite
 	</panel.string>
-	<panel.string name="time">
+	<panel.string name="time_ampm">
 		[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
 	</panel.string>
 	<panel.string name="timeTooltip">
diff --git a/indra/newview/skins/default/xui/en/floater_directory.xml b/indra/newview/skins/default/xui/en/floater_directory.xml
new file mode 100644
index 0000000000..3274474337
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_directory.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_close="true"
+ can_drag_on_left="false"
+ single_instance="true"
+ can_resize="true"
+ height="570"
+ min_height="570"
+ width="780"
+ min_width="780"
+ name="directory"
+ title="Search">
+    <tab_container
+     top="0"
+     left="0"
+     follows="left|top|right|bottom"
+     height="550"
+     width="780"
+     mouse_opaque="false"
+     name="Directory Tabs"
+     tab_position="top">
+        <panel
+         border="false"
+         label="People"
+         filename="panel_dir_people.xml"
+         class="panel_dir_people"
+         name="panel_dir_people"
+         follows="left|top|right"
+         layout="topleft"
+         left="0"
+         top="0"
+         bottom="-1" />
+        <panel
+         border="false"
+         label="Groups"
+         filename="panel_dir_groups.xml"
+         class="panel_dir_groups"
+         name="panel_dir_groups"
+         follows="left|top|right"
+         layout="topleft"
+         left="0"
+         top="0"
+         bottom="-1" />
+        <panel
+         border="false"
+         label="Places"
+         filename="panel_dir_places.xml"
+         class="panel_dir_places"
+         name="panel_dir_places"
+         follows="left|top|right"
+         layout="topleft"
+         left="0"
+         top="0"
+         bottom="-1" />
+        <panel
+         border="false"
+         label="Land Sales"
+         filename="panel_dir_land.xml"
+         class="panel_dir_land"
+         name="panel_dir_land"
+         follows="left|top|right"
+         layout="topleft"
+         left="0"
+         top="0"
+         bottom="-1" />
+        <panel
+         border="false"
+         label="Events"
+         filename="panel_dir_events.xml"
+         class="panel_dir_events"
+         name="panel_dir_events"
+         follows="left|top|right"
+         layout="topleft"
+         left="0"
+         top="0"
+         bottom="-1" />
+        <panel
+         border="false"
+         label="Classifieds"
+         filename="panel_dir_classified.xml"
+         class="panel_dir_classified"
+         name="panel_dir_classified"
+         follows="left|top|right"
+         layout="topleft"
+         left="0"
+         top="0"
+         bottom="-1" />
+        <panel
+         border="false"
+         label="Web"
+         filename="panel_dir_web.xml"
+         class="panel_dir_web"
+         name="panel_dir_web"
+         follows="left|top|right"
+         layout="topleft"
+         left="0"
+         top="0"
+         bottom="-1" />
+</tab_container>
+    <panel
+     top="65"
+     follows="right|top"
+     height="486"
+     left="345"
+     visible="false"
+     name="panel_profile_secondlife"
+     class="panel_profile_secondlife"
+     filename="panel_profile_secondlife.xml"
+     width="425" />
+    <panel
+     top="70"
+     follows="bottom|right|top"
+     height="482"
+     left="345"
+     visible="false"
+     name="panel_group_info_sidetray"
+     class="panel_group_info_sidetray"
+     filename="panel_group_info_sidetray.xml"
+     width="425" />
+    <panel
+     top="70"
+     follows="bottom|right|top"
+     height="484"
+     left="345"
+     visible="false"
+     name="panel_places"
+     class="panel_places"
+     filename="panel_places.xml"
+     width="425" />
+    <panel
+     top="70"
+     follows="bottom|right|top"
+     height="481"
+     left="345"
+     visible="false"
+     name="panel_classified_info"
+     class="panel_classified_info"
+     filename="panel_classified_info.xml"
+     width="425" />
+    <panel
+     top="70"
+     follows="bottom|right|top"
+     height="480"
+     left="345"
+     visible="false"
+     name="panel_event_info"
+     class="panel_event_info"
+     filename="panel_event_info.xml"
+     width="425" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml
index 832716c600..51e740d687 100644
--- a/indra/newview/skins/default/xui/en/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_gesture.xml
@@ -35,9 +35,13 @@
      top="20"
      name="gesture_list">
         <scroll_list.columns
+         label=""
+         name="active"
+         width="10" />
+        <scroll_list.columns
          label="Name"
          name="name"
-         width="153" />
+         width="143" />
         <scroll_list.columns
          label="Chat"
          name="trigger"
diff --git a/indra/newview/skins/default/xui/en/menu_favorites.xml b/indra/newview/skins/default/xui/en/menu_favorites.xml
index 6345394b46..f82f705fb7 100644
--- a/indra/newview/skins/default/xui/en/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/en/menu_favorites.xml
@@ -35,6 +35,9 @@
         <menu_item_call.on_click
          function="Favorites.DoToSelected"
          parameter="show_on_map" />
+        <menu_item_call.on_enable
+         function="Favorites.EnableSelected"
+         parameter="show_on_map" />
     </menu_item_call>
     <menu_item_call
      label="Copy SLurl"
@@ -43,6 +46,9 @@
         <menu_item_call.on_click
          function="Favorites.DoToSelected"
          parameter="copy_slurl" />
+        <menu_item_call.on_enable
+         function="Favorites.EnableSelected"
+         parameter="copy_slurl" />
     </menu_item_call>
     <menu_item_call
      label="Create Pick"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 081e5be014..c93cb7822e 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -125,7 +125,6 @@
       </menu_item_call>
 
       <menu_item_separator/>
-
       <menu_item_call
          label="Preferences..."
          name="Preferences"
@@ -688,6 +687,13 @@
             <menu_item_check.on_click
              function="Avatar.ToggleSearch"/>
             </menu_item_check>
+        <menu_item_call
+         label="Legacy Search..."
+         name="LegacySearch">
+            <menu_item_call.on_click
+             function="Floater.Toggle"
+             parameter="legacy_search" />
+        </menu_item_call>
         <menu_item_separator/>
         <menu_item_call
          label="Teleport home"
@@ -718,8 +724,7 @@
         
 <menu_item_call
          label="360 snapshot"
-         name="Capture 360"
-         shortcut="control|alt|shift|s">
+         name="Capture 360">
             <menu_item_call.on_click
              function="Floater.Show"
              parameter="360capture" />
@@ -1551,6 +1556,18 @@ function="World.EnvPreset"
                   <menu_item_check.on_click
                    function="View.HighlightTransparent" />
                 </menu_item_check>
+                <menu_item_check
+                   label="Highlight Transparent Probes"
+                   name="Highlight Transparent Probes"
+                   shortcut="alt|shift|T">
+                  <menu_item_check.on_check
+                   function="CheckControl"
+                   parameter="RenderReflectionProbeShowTransparent" />
+                  <menu_item_check.on_click
+                   function="View.HighlightTransparentProbe" />
+                  <menu_item_check.on_enable
+                   function="View.CheckHighlightTransparent"/>
+                </menu_item_check>
         <menu_item_separator/>
           
           <menu_item_check
@@ -3359,8 +3376,7 @@ function="World.EnvPreset"
             </menu_item_check>
             <menu_item_check
              label="Object-Object Occlusion"
-             name="Object-Object Occlusion"
-             shortcut="control|shift|O">
+             name="Object-Object Occlusion">
                 <menu_item_check.on_check
                  function="CheckControl"
                  parameter="UseOcclusion" />
@@ -3487,6 +3503,16 @@ function="World.EnvPreset"
                  parameter="RenderAttachedParticles" />
             </menu_item_check>
             <menu_item_check
+              label="Render Avatar Cloth"
+             name="Render Avatar Cloth">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="RenderAvatarCloth" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="RenderAvatarCloth" />
+            </menu_item_check>
+            <menu_item_check
              label="Collect Font Vertex Buffers"
              name="Collect Font Vertex Buffers">
                 <menu_item_check.on_check
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index dbd513afe8..82e2229d76 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2466,6 +2466,17 @@ You already have a landmark for this location.
   </notification>
 
   <notification
+   icon="alert.tga"
+   name="LandmarkLocationUnknown"
+   type="alert">
+Viewer wasn't able to get region's location. Region might be temporarily unavailable, was removed or landmark failed to load.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  <tag>fail</tag>
+  </notification>
+
+  <notification
    icon="alertmodal.tga"
    name="CannotCreateLandmarkNotOwner"
    type="alertmodal">
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index afd3f9410b..b05904cd28 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -344,7 +344,6 @@
           width="290"
           height="215">
         <text
-         auto_resize="false"
          follows="left|top"
          font.style="BOLD"
          height="10"
diff --git a/indra/newview/skins/default/xui/en/panel_dir_classified.xml b/indra/newview/skins/default/xui/en/panel_dir_classified.xml
new file mode 100644
index 0000000000..f4d3ccf748
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_dir_classified.xml
@@ -0,0 +1,215 @@
+<panel
+ border="true"
+ top="30"
+ follows="left|top|right|bottom"
+ height="533"
+ label="Classifieds"
+ left="1"
+ left_delta="68"
+ mouse_opaque="false"
+ name="panel_dir_classified"
+ width="778">
+    <string name="searching_text">
+        Searching...
+    </string>
+    <string name="not_found_text">
+        None Found.
+    </string>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     top="8"
+     layout="topleft"
+     follows="left|top"
+     font="SansSerif"
+     h_pad="0"
+     halign="left"
+     height="16"
+     left="5"
+     mouse_opaque="true"
+     name="find"
+     v_pad="0"
+     width="150">
+        Enter search terms:
+    </text>
+    <combo_box
+     allow_text_entry="false"
+     top_delta="0"
+     left="525"
+     layout="topleft"
+     follows="right|top"
+     height="18"
+     max_chars="20"
+     mouse_opaque="true"
+     name="Category"
+     width="128">
+        <combo_item name="AnyCategory" value="0" label="Any Category"/>
+        <combo_item name="Shopping" value="1" label="Shopping"/>
+        <combo_item name="LandRental" value="2" label="Land Rental"/>
+        <combo_item name="PropertyRental" value="3" label="Property Rental"/>
+        <combo_item name="SpecialAttraction" value="4" label="Special Attraction"/>
+        <combo_item name="NewProducts" value="5" label="New Products"/>
+        <combo_item name="Employment" value="6" label="Employment"/>
+        <combo_item name="Wanted" value="7" label="Wanted"/>
+        <combo_item name="Service" value="8" label="Service"/>
+        <combo_item name="Personal" value="9" label="Personal"/>
+     </combo_box>
+    <check_box
+     left_pad="5"
+     control_name="ShowPGClassifieds"
+     follows="right|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label=""
+     mouse_opaque="true"
+     name="incpg"
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_PG_Dark"
+     tool_tip="General"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_general"
+     width="16"/>
+    <check_box
+     left_pad="4"
+     top_delta="1"
+     layout="topleft"
+     control_name="ShowMatureClassifieds"
+     follows="right|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label=""
+     mouse_opaque="true"
+     name="incmature"
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_M_Dark"
+     tool_tip="Moderate"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_moderate"
+     width="16"/>
+    <check_box
+     left_pad="4"
+     top_delta="1"
+     layout="topleft"
+     control_name="ShowAdultClassifieds"
+     follows="right|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="false"
+     label=""
+     mouse_opaque="true"
+     name="incadult"
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_R_Dark"
+     tool_tip="Adult"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_adult"
+     width="16"/>
+    <line_editor
+     bevel_style="in"
+     border_style="line"
+     border_thickness="1"
+     top_pad="3"
+     follows="left|right|top"
+     layout="topleft"
+     font="SansSerif"
+     height="18"
+     left="5"
+     max_length="63"
+     mouse_opaque="true"
+     name="name"
+     width="650" />
+    <button
+     follows="right|top"
+     layout="topleft"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="Search"
+     top_delta="0"
+     left_pad="5"
+     mouse_opaque="true"
+     name="Search"
+     width="105" />
+    <scroll_list
+     background_visible="true"
+     layout="topleft"
+     top_pad="3"
+     column_padding="0"
+     draw_border="true"
+     draw_heading="true"
+     follows="left|top|right|bottom"
+     height="450"
+     left="5"
+     mouse_opaque="true"
+     multi_select="false"
+     name="results"
+     search_column="2"
+     width="336">
+        <column label="" name="icon" width="24" />
+        <column label="" name="type" width="-1" />
+        <column label="Name" name="name" width="225" />
+        <column label="Price" name="price" width="55" />
+    </scroll_list>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     bottom_delta="-20"
+     follows="left|bottom"
+     font="SansSerifSmall"
+     h_pad="0"
+     halign="left"
+     height="16"
+     left="4"
+     mouse_opaque="true"
+     name="result_text"
+     v_pad="0"
+     width="80" />
+    <button
+     image_overlay="Arrow_Left_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     hover_glow_amount="0.15"
+     tool_tip="Previous page"
+     follows="right|bottom"
+     height="22"
+     right="305"
+     bottom="-533"
+     name="prev_btn"
+     width="32" />
+    <button
+     image_overlay="Arrow_Right_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     tool_tip="Next page"
+     follows="right|bottom"
+     height="22"
+     layout="topleft"
+     left_pad="5"
+     name="next_btn"
+     top_delta="0"
+     width="32"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dir_events.xml b/indra/newview/skins/default/xui/en/panel_dir_events.xml
new file mode 100644
index 0000000000..b194ce5646
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_dir_events.xml
@@ -0,0 +1,300 @@
+<panel
+ border="true"
+ top="30"
+ default_tab_group="1"
+ follows="left|top|right|bottom"
+ height="533"
+ label="Events"
+ left="1"
+ mouse_opaque="false"
+ name="panel_dir_events"
+ width="778">
+    <string name="searching_text">
+        Searching...
+    </string>
+    <string name="not_found_text">
+        None Found.
+    </string>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     top="8"
+     layout="topleft"
+     follows="left|top"
+     font="SansSerif"
+     h_pad="0"
+     halign="left"
+     height="16"
+     left="5"
+     mouse_opaque="true"
+     name="find"
+     width="150">
+        Enter search terms:
+    </text>
+    <combo_box
+     allow_text_entry="false"
+     top_delta="0"
+     left="525"
+     layout="topleft"
+     follows="right|top"
+     height="18"
+     max_chars="20"
+     mouse_opaque="true"
+     name="category_combo"
+     width="128">
+        <combo_item name="All" value="0" label="Any Category"/>
+        <combo_item name="Discussion" value="18" label="Discussion"/>
+        <combo_item name="Sports" value="19" label="Sports"/>
+        <combo_item name="LiveMusic" value="20" label="Live Music"/>
+        <combo_item name="LiveDJ" value="30" label="Live DJ"/>
+        <combo_item name="Commercial" value="22" label="Commercial"/>
+        <combo_item name="Nightlife/Entertainment" value="23" label="Nightlife/Entertainment"/>
+        <combo_item name="Games/Contests" value="24" label="Games/Contests"/>
+        <combo_item name="Pageants" value="25" label="Pageants"/>
+        <combo_item name="Education" value="26" label="Education"/>
+        <combo_item name="ArtsandCulture" value="27" label="Arts and Culture"/>
+        <combo_item name="Charity/SupportGroups" value="28" label="Charity/Support Groups"/>
+        <combo_item name="Miscellaneous" value="29" label="Miscellaneous"/>
+    </combo_box>
+    <check_box
+     left_pad="5"
+     control_name="ShowPGEvents"
+     follows="right|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label=""
+     mouse_opaque="true"
+     name="incpg"
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_PG_Dark"
+     tool_tip="General"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_general"
+     width="16"/>
+    <check_box
+     left_pad="4"
+     top_delta="1"
+     layout="topleft"
+     control_name="ShowMatureEvents"
+     follows="right|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label=""
+     mouse_opaque="true"
+     name="incmature"
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_M_Dark"
+     tool_tip="Moderate"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_moderate"
+     width="16"/>
+    <check_box
+     left_pad="4"
+     top_delta="1"
+     layout="topleft"
+     control_name="ShowAdultEvents"
+     follows="right|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="false"
+     label=""
+     mouse_opaque="true"
+     name="incadult"
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_R_Dark"
+     tool_tip="Adult"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_adult"
+     width="16"/>
+    <line_editor
+     bevel_style="in"
+     border_style="line"
+     border_thickness="1"
+     top_pad="3"
+     follows="left|right|top"
+     layout="topleft"
+     font="SansSerif"
+     height="18"
+     left="5"
+     max_length="63"
+     mouse_opaque="true"
+     name="event_search_text"
+     width="650" />
+    <button
+     follows="right|top"
+     layout="topleft"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="Search"
+     top_delta="0"
+     left_pad="5"
+     mouse_opaque="true"
+     name="Search"
+     width="105" />
+    <scroll_list
+     background_visible="true"
+     layout="topleft"
+     top_pad="3"
+     column_padding="0"
+     draw_border="true"
+     draw_heading="true"
+     follows="left|top|right|bottom"
+     height="450"
+     left="5"
+     mouse_opaque="true"
+     multi_select="false"
+     name="results"
+     search_column="2"
+     width="336">
+        <column label="" name="icon" width="24" />
+        <column label="" name="type" width="-1" />
+        <column dynamicwidth="true" label="Name" name="name" />
+        <column label="Time (PT)" name="date" sort="time" width="106" />
+        <column label="" name="event_id" width="-1" />
+        <column label="Time" name="time" width="-1" />
+    </scroll_list>
+    <text
+     bg_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="80" />
+    <button
+     image_overlay="Arrow_Left_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     hover_glow_amount="0.15"
+     tool_tip="Previous page"
+     follows="right|bottom"
+     height="22"
+     right="305"
+     bottom="-533"
+     name="prev_btn"
+     width="32" />
+    <button
+     image_overlay="Arrow_Right_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     tool_tip="Next page"
+     follows="right|bottom"
+     height="22"
+     layout="topleft"
+     left_pad="5"
+     name="next_btn"
+     top_delta="0"
+     width="32"/>
+    <radio_group
+     top="5"
+     draw_border="false"
+     follows="top|left"
+     layout="topleft"
+     height="16"
+     left="160"
+     mouse_opaque="true"
+     name="date_mode"
+     initial_value="current"
+     width="200">
+        <radio_item
+         layout="topleft"
+         left="3"
+         top="0"
+         follows="left|top"
+         height="20"
+         mouse_opaque="true"
+         name="current"
+         width="170"
+         label="In-Progress &amp; Upcoming"/>
+        <radio_item
+         layout="topleft"
+         follows="left|top"
+         height="20"
+         top_delta="0"
+         left_delta="151"
+         mouse_opaque="true"
+         name="date"
+         width="56"
+         label="Date"/>
+    </radio_group>
+    <button
+     top="6"
+     left_pad="15"
+     layout="topleft"
+     follows="left|top"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="&lt;&lt;"
+     label_selected="&lt;&lt;"
+     left_delta="54"
+     mouse_opaque="true"
+     name="back_btn"
+     tool_tip="Go back a day"
+     width="20" />
+    <text
+     top="8"
+     bg_visible="false"
+     border_visible="false"
+     left_pad="1"
+     layout="topleft"
+     drop_shadow_visible="true"
+     follows="left|top"
+     font="SansSerif"
+     h_pad="0"
+     halign="center"
+     height="14"
+     mouse_opaque="true"
+     name="date_text"
+     v_pad="0"
+     width="48">
+        6/6
+    </text>
+    <button
+     top="6"
+     left_pad="1"
+     layout="topleft"
+     follows="left|top"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="&gt;&gt;"
+     label_selected="&gt;&gt;"
+     left_delta="50"
+     mouse_opaque="true"
+     name="forward_btn"
+     tool_tip="Go forward a day"
+     width="20" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dir_groups.xml b/indra/newview/skins/default/xui/en/panel_dir_groups.xml
new file mode 100644
index 0000000000..ed3f709005
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_dir_groups.xml
@@ -0,0 +1,129 @@
+<panel
+ border="true"
+ top="30"
+ follows="left|top|right|bottom"
+ height="533"
+ label="Groups"
+ left="1"
+ mouse_opaque="false"
+ name="panel_dir_groups"
+ width="778">
+    <button
+     image_overlay="Arrow_Left_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     hover_glow_amount="0.15"
+     tool_tip="Previous page"
+     follows="right|bottom"
+     height="22"
+     right="305"
+     bottom="-533"
+     name="prev_btn"
+     width="32" />
+    <button
+     image_overlay="Arrow_Right_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     tool_tip="Next page"
+     follows="right|bottom"
+     height="22"
+     layout="topleft"
+     left_pad="5"
+     name="next_btn"
+     top_delta="0"
+     width="32"/>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     top="8"
+     layout="topleft"
+     follows="left|top"
+     font="SansSerif"
+     h_pad="0"
+     halign="left"
+     height="16"
+     left="5"
+     mouse_opaque="true"
+     name="find"
+     v_pad="0"
+     width="150">
+        Enter search terms:
+    </text>
+    <check_box
+     top_delta="0"
+     control_name="ShowMatureGroups"
+     follows="right|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="false"
+     label="Include Mature groups"
+     left="510"
+     mouse_opaque="true"
+     name="incmature"
+     width="100" />
+    <line_editor
+     bevel_style="in"
+     border_style="line"
+     border_thickness="1"
+     top_pad="5"
+     follows="left|right|top"
+     font="SansSerif"
+     height="18"
+     left="5"
+     max_length="63"
+     mouse_opaque="true"
+     name="name"
+     width="650" />
+    <button
+     follows="right|top"
+     layout="topleft"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="Search"
+     top_delta="0"
+     left_pad="5"
+     mouse_opaque="true"
+     name="Search"
+     width="105" />
+    <scroll_list
+     background_visible="true"
+     layout="topleft"
+     top_pad="3"
+     column_padding="0"
+     draw_border="true"
+     draw_heading="true"
+     follows="left|top|right|bottom"
+     height="450"
+     left="5"
+     mouse_opaque="true"
+     multi_select="false"
+     name="results"
+     search_column="2"
+     width="336">
+        <column label="" name="icon" width="24" sort="score" sort_ascending="false" />
+        <column label="" name="type" width="-1" />
+        <column label="Name" name="name" dynamicwidth="true" />
+        <column label="Members" name="members" width="100" halign="left" sort_ascending="false" />
+        <column label="" name="score" width="-1"/>
+    </scroll_list>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     bottom_delta="-20"
+     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>
diff --git a/indra/newview/skins/default/xui/en/panel_dir_land.xml b/indra/newview/skins/default/xui/en/panel_dir_land.xml
new file mode 100644
index 0000000000..61629f3033
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_dir_land.xml
@@ -0,0 +1,268 @@
+<panel border="true" top="30" follows="left|top|right|bottom" height="533"
+     label="Land Sales" left="1" mouse_opaque="false" name="panel_dir_land"
+     width="778">
+    <string name="searching_text">
+        Searching...
+    </string>
+    <string name="not_found_text">
+        None Found.
+    </string>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     top="8"
+     layout="topleft"
+     follows="left|top"
+     font="SansSerif"
+     h_pad="0"
+     halign="left"
+     height="16"
+     left="5"
+     mouse_opaque="true"
+     name="find"
+     width="150">
+        Enter search terms:
+    </text>
+    <combo_box
+     allow_text_entry="false"
+     follows="top|right"
+     layout="topleft"
+     height="18"
+     top_delta="0"
+     left="525"
+     max_chars="20"
+     mouse_opaque="true"
+     name="type"
+     width="128">
+        <combo_item name="AllTypes" value="All Types" label="All Types"/>
+        <combo_item name="Auction" value="Auction" label="Auction"/>
+        <combo_item name="MainlandSales" value="Mainland Sales" label="For Sale - Mainland"/>
+        <combo_item name="EstateSales" value="Estate Sales" label="For Sale - Estate"/>
+    </combo_box>
+    <check_box
+     left_pad="5"
+     control_name="ShowPGLand"
+     follows="right|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label=""
+     mouse_opaque="true"
+     name="incpg"
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_PG_Dark"
+     tool_tip="General"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_general"
+     width="16"/>
+    <check_box
+     left_pad="4"
+     top_delta="1"
+     layout="topleft"
+     control_name="ShowMatureLand"
+     follows="right|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label=""
+     mouse_opaque="true"
+     name="incmature"
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_M_Dark"
+     tool_tip="Moderate"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_moderate"
+     width="16"/>
+    <check_box
+     left_pad="4"
+     top_delta="1"
+     layout="topleft"
+     control_name="ShowAdultLand"
+     follows="right|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="false"
+     label=""
+     mouse_opaque="true"
+     name="incadult"
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_R_Dark"
+     tool_tip="Adult"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_adult"
+     width="16"/>
+    <check_box
+     top_pad="3"
+     layout="topleft"
+     control_name="FindLandPrice"
+     follows="left|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label="Price &#8804; "
+     left="5"
+     mouse_opaque="true"
+     name="pricecheck"
+     width="60" />
+    <line_editor
+     bevel_style="in"
+     border_style="line"
+     border_thickness="1"
+     follows="left|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     height="16"
+     left_pad="1"
+     max_length="10"
+     mouse_opaque="true"
+     name="priceedit"
+     width="50" />
+    <text
+     bg_visible="false"
+     border_visible="false"
+     follows="left|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     halign="left"
+     height="16"
+     left_pad="3"
+     mouse_opaque="true"
+     name="pricecheck_symbol"
+     width="15">
+        L$
+    </text>
+    <check_box
+     control_name="FindLandArea"
+     follows="left|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label="Area &#8805; "
+     left_pad="10"
+     mouse_opaque="true"
+     name="areacheck"
+     width="60" />
+    <line_editor
+     bevel_style="in"
+     border_style="line"
+     border_thickness="1"
+     follows="left|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     height="16"
+     left_pad="1"
+     max_length="10"
+     mouse_opaque="true"
+     name="areaedit"
+     width="50" />
+    <text
+     bg_visible="false"
+     border_visible="false"
+     follows="left|top"
+     layout="topleft"
+     left_pad="3"
+     font="SansSerifSmall"
+     halign="left"
+     height="16"
+     mouse_opaque="true"
+     name="areacheck_symbol"
+     width="15">
+        m²
+    </text>
+    <button
+     follows="right|top"
+     layout="topleft"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="Search"
+     top_delta="0"
+     left="660"
+     mouse_opaque="true"
+     name="Search"
+     width="105" />
+    <scroll_list
+     background_visible="true"
+     layout="topleft"
+     top_pad="3"
+     column_padding="0"
+     draw_border="true"
+     draw_heading="true"
+     follows="left|top|right|bottom"
+     height="450"
+     left="5"
+     mouse_opaque="true"
+     multi_select="false"
+     name="results"
+     search_column="2"
+     width="336">
+        <column label="" name="icon" width="24" />
+        <column dynamicwidth="true" label="Name" name="name" />
+        <column label="Type" name="landtype" width="50" />
+        <column label="L$ Price" name="price" width="65" />
+        <column label="Area" name="area" width="50" />
+        <column label="L$/m²" name="per_meter" width="65" />
+    </scroll_list>
+    <text
+     bg_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" />
+    <button
+     image_overlay="Arrow_Left_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     hover_glow_amount="0.15"
+     tool_tip="Previous page"
+     follows="right|bottom"
+     height="22"
+     right="305"
+     bottom="-533"
+     name="prev_btn"
+     width="32" />
+    <button
+     image_overlay="Arrow_Right_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     tool_tip="Next page"
+     follows="right|bottom"
+     height="22"
+     layout="topleft"
+     left_pad="5"
+     name="next_btn"
+     top_delta="0"
+     width="32"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dir_people.xml b/indra/newview/skins/default/xui/en/panel_dir_people.xml
new file mode 100644
index 0000000000..fe1a7e9d94
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_dir_people.xml
@@ -0,0 +1,120 @@
+<panel
+ border="true"
+ top="30"
+ follows="left|top|right|bottom"
+ height="533"
+ label="People"
+ left="1"
+ mouse_opaque="false"
+ name="panel_dir_people"
+ width="778">
+    <string name="searching_text">
+        Searching...
+    </string>
+    <string name="not_found_text">
+        None Found.
+    </string>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     top="8"
+     layout="topleft"
+     follows="left|top"
+     font="SansSerif"
+     h_pad="0"
+     halign="left"
+     height="16"
+     left="5"
+     mouse_opaque="true"
+     name="find"
+     width="150">
+        Enter search terms:
+    </text>
+    <line_editor
+     bevel_style="in"
+     border_style="line"
+     border_thickness="1"
+     top_pad="5"
+     follows="left|right|top"
+     font="SansSerif"
+     height="18"
+     left="5"
+     max_length="63"
+     mouse_opaque="true"
+     name="name"
+     width="650" />
+    <button
+     follows="right|top"
+     layout="topleft"
+     font="SansSerif"
+     top_delta="0"
+     left_pad="5"
+     height="20"
+     label="Search"
+     mouse_opaque="true"
+     name="Search"
+     width="105" />
+    <scroll_list
+     background_visible="true"
+     layout="topleft"
+     top_pad="3"
+     column_padding="0"
+     draw_border="true"
+     draw_heading="true"
+     follows="left|top|right|bottom"
+     height="450"
+     left="5"
+     mouse_opaque="true"
+     multi_select="false"
+     name="results"
+     search_column="2"
+     width="336">
+        <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_visible="false"
+     bottom_delta="-20"
+     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" />
+    <button
+     image_overlay="Arrow_Left_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     hover_glow_amount="0.15"
+     tool_tip="Previous page"
+     follows="right|bottom"
+     height="22"
+     right="305"
+     bottom="-533"
+     name="prev_btn"
+     width="32" />
+    <button
+     image_overlay="Arrow_Right_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     tool_tip="Next page"
+     follows="right|bottom"
+     height="22"
+     layout="topleft"
+     left_pad="5"
+     name="next_btn"
+     top_delta="0"
+     width="32"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dir_places.xml b/indra/newview/skins/default/xui/en/panel_dir_places.xml
new file mode 100644
index 0000000000..d337f3addf
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_dir_places.xml
@@ -0,0 +1,215 @@
+<panel
+ border="true"
+ top="30"
+ follows="left|top|right|bottom"
+ height="533"
+ label="Places"
+ left="1"
+ mouse_opaque="false"
+ name="panel_dir_places"
+ width="778">
+    <string name="searching_text">
+        Searching...
+    </string>
+    <string name="not_found_text">
+        None Found.
+    </string>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     top="8"
+     layout="topleft"
+     follows="left|top"
+     font="SansSerif"
+     h_pad="0"
+     halign="left"
+     height="16"
+     left="5"
+     mouse_opaque="true"
+     name="find"
+     width="150">
+        Enter search terms:
+    </text>
+    <combo_box
+     allow_text_entry="false"
+     follows="right|top"
+     layout="topleft"
+     height="18"
+     top_delta="0"
+     left="525"
+     max_chars="20"
+     mouse_opaque="true"
+     name="Category"
+     width="128">
+        <combo_item name="AnyCategory" value="any" label="Any Category"/>
+        <combo_item name="LindenLocation" value="linden" label="Linden Location"/>
+        <combo_item name="Arts&amp;Culture" value="arts" label="Arts &amp; Culture"/>
+        <combo_item name="Business" value="store" label="Business"/>
+        <combo_item name="Educational" value="educational" label="Educational"/>
+        <combo_item name="Gaming" value="game" label="Gaming"/>
+        <combo_item name="Hangout" value="gather" label="Hangout"/>
+        <combo_item name="NewcomerFriendly" value="newcomer" label="Newcomer Friendly"/>
+        <combo_item name="Parks&amp;Nature" value="park" label="Parks &amp; Nature"/>
+        <combo_item name="Residential" value="home" label="Residential"/>
+        <combo_item name="Shopping" value="shopping" label="Shopping"/>
+        <combo_item name="Adult" value="adult" label="Adult"/>
+        <combo_item name="Other" value="other" label="Other"/>
+    </combo_box>
+    <check_box
+     left_pad="5"
+     control_name="ShowPGSims"
+     follows="right|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label=""
+     mouse_opaque="true"
+     name="incpg"
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_PG_Dark"
+     tool_tip="General"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_general"
+     width="16"/>
+    <check_box
+     left_pad="4"
+     top_delta="1"
+     layout="topleft"
+     control_name="ShowMatureSims"
+     follows="right|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label=""
+     mouse_opaque="true"
+     name="incmature"
+     width="15" />
+     <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_M_Dark"
+     tool_tip="Moderate"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_moderate"
+     width="16"/>
+    <check_box
+     left_pad="4"
+     top_delta="1"
+     layout="topleft"
+     control_name="ShowAdultSims"
+     follows="right|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="false"
+     label=""
+     mouse_opaque="true"
+     name="incadult"
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_R_Dark"
+     tool_tip="Adult"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_adult"
+     width="16"/>
+    <line_editor
+     bevel_style="in"
+     border_style="line"
+     border_thickness="1"
+     top_pad="3"
+     follows="left|right|top"
+     layout="topleft"
+     font="SansSerif"
+     height="18"
+     left="5"
+     max_length="63"
+     mouse_opaque="true"
+     name="name"
+     width="650" />
+    <button
+     follows="right|top"
+     layout="topleft"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="Search"
+     top_delta="0"
+     left_pad="5"
+     mouse_opaque="true"
+     name="Search"
+     width="105" />
+    <scroll_list
+     background_visible="true"
+     layout="topleft"
+     top_pad="3"
+     column_padding="0"
+     draw_border="true"
+     draw_heading="true"
+     follows="left|top|right|bottom"
+     height="450"
+     left="5"
+     mouse_opaque="true"
+     multi_select="false"
+     name="results"
+     search_column="2"
+     width="336">
+        <column label="" name="icon" width="24" />
+        <column dynamicwidth="true" label="Name" name="name" />
+        <column label="Traffic" name="dwell" width="75" />
+    </scroll_list>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     bottom_delta="-20"
+     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" />
+    <button
+     image_overlay="Arrow_Left_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     hover_glow_amount="0.15"
+     tool_tip="Previous page"
+     follows="right|bottom"
+     height="22"
+     right="305"
+     bottom="-533"
+     name="prev_btn"
+     width="32" />
+    <button
+     image_overlay="Arrow_Right_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     tool_tip="Next page"
+     follows="right|bottom"
+     height="22"
+     layout="topleft"
+     left_pad="5"
+     name="next_btn"
+     top_delta="0"
+     width="32"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dir_web.xml b/indra/newview/skins/default/xui/en/panel_dir_web.xml
new file mode 100644
index 0000000000..0dde67681a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_dir_web.xml
@@ -0,0 +1,76 @@
+<panel
+ border="true"
+ top="30"
+ follows="all"
+ height="543"
+ label="Web"
+ left="1"
+ mouse_opaque="false"
+ name="panel_dir_web"
+ width="778">
+    <web_browser
+     top="0"
+     left="0"
+     height="515"
+     width="778"
+     follows="all"
+     layout="topleft"
+     name="web_search"
+     trusted_content="true"/>
+    <button
+     image_overlay="Arrow_Left_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     hover_glow_amount="0.15"
+     tool_tip="Navigate back"
+     follows="left|bottom"
+     height="22"
+     layout="topleft"
+     left="5"
+     name="back_btn"
+     top_pad="7"
+     width="22" />
+    <button
+     image_overlay="Arrow_Right_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     tool_tip="Navigate forward"
+     follows="left|bottom"
+     height="22"
+     layout="topleft"
+     left_pad="5"
+     name="forward_btn"
+     top_delta="0"
+     width="22"/>
+    <button
+     name="home_btn"
+     follows="left|bottom"
+     image_overlay="Home_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     layout="topleft"
+     tool_tip="Search page"
+     left_pad="5"
+     height="22"
+     width="22"/>
+    <text
+     type="string"
+     length="200"
+     follows="bottom|left"
+     height="20"
+     layout="topleft"
+     left_pad="20"
+     top_delta="5"
+     name="statusbartext"
+     parse_urls="false"
+     text_color="0.4 0.4 0.4 1"
+     width="495"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_event_info.xml b/indra/newview/skins/default/xui/en/panel_event_info.xml
new file mode 100644
index 0000000000..b31918b919
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_event_info.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="false"
+ follows="all"
+ height="570"
+ left="0"
+ top="0"
+ name="panel_event_info"
+ title="Event"
+ width="330">
+    <string name="none">
+        none
+    </string>
+    <string name="notify">
+        Notify
+    </string>
+    <string name="dont_notify">
+        Don&apos;t Notify
+    </string>
+    <text
+     top="4"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerifBig"
+     left="5"
+     width="417"
+     height="18"
+     use_ellipses="true"
+     name="event_name">
+        (none)
+    </text>
+    <text
+     top_pad="10"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="20"
+     name="event_category_label">
+        Type:
+    </text>
+    <text
+     top_delta="0"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="120"
+    name="event_category">
+        (none)
+    </text>
+    <text
+     top_pad="10"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="20"
+     name="event_mature_label">
+        Mature Content:
+    </text>
+    <text
+     top_delta="0"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="120"
+     name="event_mature_yes"
+     visible="false">
+        Yes
+    </text>
+    <text
+     top_delta="0"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="120"
+     name="event_mature_no"
+     visible="false">
+        No
+    </text>
+    <text
+     top_pad="10"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="20"
+     name="event_date_label">
+        Date:
+    </text>
+    <text
+     top_delta="0"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="120"
+     name="event_date">
+        (none)
+    </text>
+    <text
+     top_pad="10"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="20"
+     name="event_duration_label">
+        Event Duration:
+    </text>
+    <text
+     top_delta="0"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="120"
+     name="event_duration">
+        (none)
+    </text>
+    <text
+     top_pad="10"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="20"
+     name="event_runby_label">
+        Run By:
+    </text>
+    <text
+     top_delta="0"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="116"
+     name="event_runby">
+        (none)
+    </text>
+    <text
+     top_pad="10"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="20"
+     name="event_location_label">
+        Location:
+    </text>
+    <text
+     top_delta="0"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="120"
+     name="event_location">
+        (none)
+    </text>
+    <text
+     top_pad="10"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="20"
+     name="event_cover_label">
+        Cover Charge:
+    </text>
+    <text
+     top_delta="0"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="120"
+     name="event_cover">
+        (none)
+    </text>
+    <text
+     top_pad="20"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="20"
+     name="event_desc_label">
+        Description:
+    </text>
+    <text_editor
+     top_pad="10"
+     follows="left|top"
+     layout="topleft"
+     height="220"
+     left="20"
+     enabled="false"
+     max_length="1024"
+     name="event_desc"
+     width="400" />
+    <button
+     bottom_delta="-24"
+     follows="left|top"
+     height="20"
+     label="Teleport"
+     left="20"
+     name="teleport_btn"
+     width="130" />
+    <button
+     bottom_delta="0"
+     follows="left|top"
+     height="20"
+     label="Show on Map"
+     left="155"
+     name="map_btn"
+     width="130" />
+    <button
+     bottom_delta="0"
+     follows="left|top"
+     height="20"
+     label="Notify"
+     left="290"
+     name="notify_btn"
+     width="130" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index ad9ce8f37e..ed6f98fb2b 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -67,23 +67,23 @@
         <scroll_list.columns
          label="Parcel"
          name="name"
-         relative_width="0.2" />
+         relative_width="0.25" />
         <scroll_list.columns
          label="Region"
          name="location"
-         relative_width="0.2" />
+         relative_width="0.25" />
         <scroll_list.columns
          label="Type"
          name="type"
-         relative_width="0.2" />
+         relative_width="0.25" />
         <scroll_list.columns
          label="Area"
          name="area"
-         relative_width="0.2" />
+         relative_width="0.25" />
         <scroll_list.columns
          label="Hidden"
          name="hidden"
-         relative_width="0.2" />
+         width="-1" />
     </scroll_list>
     <text
      type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
index 0cac1b410f..90bdea93fa 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
@@ -60,6 +60,10 @@
          name="Large(512x512)"
          value="[i512,i512]" />
         <combo_box.item
+         label="Huge (1024x1024)"
+         name="Huge(1024x1024)"
+         value="[i1024,i1024]" />
+        <combo_box.item
          label="Current Window"
          name="CurrentWindow"
          value="[i0,i0]" />
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index cf52916484..16111758cc 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -21,10 +21,14 @@
         Bandwidth
     </panel.string>
     <panel.string
-     name="time">
+     name="time_ampm">
         [hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
     </panel.string>
     <panel.string
+     name="time">
+        [hour, datetime, slt]:[min, datetime, slt] [timezone,datetime, slt]
+    </panel.string>
+    <panel.string
      name="timeTooltip">
         [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
     </panel.string>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 99c7d7b7d4..8e0eea97d1 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -327,6 +327,7 @@ are allowed.
 	<!-- searching - generic -->
 	<string name="Searching">Searching...</string>
 	<string name="NoneFound">None found.</string>
+    <string name="ServerUnavailable">Service not available.</string>
 
 	<!-- Indicates that an avatar name or other similar datum is being retrieved. General usage. -->
 	<string name="RetrievingData">Retrieving...</string>
diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml
index bdedd04cc8..1e304e9c05 100644
--- a/indra/newview/skins/default/xui/es/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml
@@ -6,7 +6,7 @@
 	<panel.string name="bandwidth_tooltip">
 		Ancho de banda
 	</panel.string>
-	<panel.string name="time">
+	<panel.string name="time_ampm">
 		[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
 	</panel.string>
 	<panel.string name="timeTooltip">
diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
index 84c6dda4b4..227525a608 100644
--- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
@@ -6,7 +6,7 @@
 	<panel.string name="bandwidth_tooltip">
 		Bande passante
 	</panel.string>
-	<panel.string name="time">
+	<panel.string name="time_ampm">
 		[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
 	</panel.string>
 	<panel.string name="timeTooltip">
diff --git a/indra/newview/skins/default/xui/it/panel_status_bar.xml b/indra/newview/skins/default/xui/it/panel_status_bar.xml
index 160fd4e180..04d61c2973 100644
--- a/indra/newview/skins/default/xui/it/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/it/panel_status_bar.xml
@@ -6,7 +6,7 @@
 	<panel.string name="bandwidth_tooltip">
 		Larghezza di banda
 	</panel.string>
-	<panel.string name="time">
+	<panel.string name="time_ampm">
 		[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
 	</panel.string>
 	<panel.string name="timeTooltip">
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index 2497b15548..bbb9d7daf1 100644
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -6,7 +6,7 @@
 	<panel.string name="bandwidth_tooltip">
 		帯域幅
 	</panel.string>
-	<panel.string name="time">
+	<panel.string name="time_ampm">
 		[ampm, datetime, slt] [hour12, datetime, slt]:[min, datetime, slt] [timezone,datetime, slt]
 	</panel.string>
 	<panel.string name="timeTooltip">
diff --git a/indra/newview/skins/default/xui/pl/panel_status_bar.xml b/indra/newview/skins/default/xui/pl/panel_status_bar.xml
index d50ed3387c..12091225f7 100644
--- a/indra/newview/skins/default/xui/pl/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/pl/panel_status_bar.xml
@@ -6,9 +6,6 @@
 	<panel.string name="bandwidth_tooltip">
 		Przepustowość
 	</panel.string>
-	<panel.string name="time">
-		[hour, datetime, slt]:[min, datetime, slt] [timezone,datetime, slt]
-	</panel.string>
 	<panel.string name="buycurrencylabel">
 		[AMT] L$
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
index 9e15f9a02c..47712ad28b 100644
--- a/indra/newview/skins/default/xui/pt/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
@@ -6,7 +6,7 @@
 	<panel.string name="bandwidth_tooltip">
 		Banda
 	</panel.string>
-	<panel.string name="time">
+	<panel.string name="time_ampm">
 		[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
 	</panel.string>
 	<panel.string name="timeTooltip">
diff --git a/indra/newview/skins/default/xui/ru/panel_status_bar.xml b/indra/newview/skins/default/xui/ru/panel_status_bar.xml
index 124b8f2cff..1fd9b94406 100644
--- a/indra/newview/skins/default/xui/ru/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ru/panel_status_bar.xml
@@ -6,9 +6,6 @@
 	<panel.string name="bandwidth_tooltip">
 		Ширина канала
 	</panel.string>
-	<panel.string name="time">
-		[hour, datetime, slt]:[min, datetime, slt] [timezone,datetime, slt]
-	</panel.string>
 	<panel.string name="timeTooltip">
 		[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/tr/panel_status_bar.xml b/indra/newview/skins/default/xui/tr/panel_status_bar.xml
index 616960ffb4..9ae5a251ec 100644
--- a/indra/newview/skins/default/xui/tr/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/tr/panel_status_bar.xml
@@ -6,7 +6,7 @@
 	<panel.string name="bandwidth_tooltip">
 		Bant genişliği
 	</panel.string>
-	<panel.string name="time">
+	<panel.string name="time_ampm">
 		[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
 	</panel.string>
 	<panel.string name="timeTooltip">
diff --git a/indra/newview/skins/default/xui/zh/panel_status_bar.xml b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
index 0d6fcea451..90155fea86 100644
--- a/indra/newview/skins/default/xui/zh/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
@@ -6,7 +6,7 @@
 	<panel.string name="bandwidth_tooltip">
 		頻寬
 	</panel.string>
-	<panel.string name="time">
+	<panel.string name="time_ampm">
 		[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
 	</panel.string>
 	<panel.string name="timeTooltip">