Second Life viewer sources 1.18.5.0-RC

25 files changed, 554 insertions, 175 deletions

diff --git a/linden/indra/newview/skins/textures/textures.xml b/linden/indra/newview/skins/textures/textures.xml
index 72c6621..cc9f61c 100644
--- a/linden/indra/newview/skins/textures/textures.xml
+++ b/linden/indra/newview/skins/textures/textures.xml
@@ -307,6 +307,7 @@
         <account_id_green.tga value="3bf64d5a-38d3-b752-cf52-3d9f8fca353a"/>
         <status_push.tga value="07d1f523-e327-4d10-20d6-8bc22a6e8f56"/>
         <status_voice.tga value="c49b0b3b-fe04-46ee-abab-777fa0b462b6"/>
+        <status_search.tga value="6846fb08-fe38-40be-b145-d8d7b2e1d0d8"/>
         <ff_visible_online.tga value="d609a41f-34c0-7aae-b2c6-2fc3ab26d916"/>
         <ff_visible_map.tga value="20b52706-c1ab-414a-9dea-1cb788ad5689"/>
         <ff_edit_mine.tga value="1baee0b9-4b89-39eb-8815-866d82300ab5"/>
diff --git a/linden/indra/newview/skins/xui/en-us/LCD_text.xml b/linden/indra/newview/skins/xui/en-us/LCD_text.xml
new file mode 100644
index 0000000..d679d64
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/LCD_text.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel bottom="0" follows="left|top|right|bottom" height="600" hidden="true" left="0"

+     mouse_opaque="true" name="panel_login" width="800">

+        <text hidden="true" name="DebugInfo">Debug Info</text>

+        <text hidden="true" name="FPS">FPS</text>

+        <text hidden="true" name="SimFPS">SimFPS</text>

+        <text hidden="true" name="Pin">P-In</text>

+        <text hidden="true" name="Pout">P-Out</text>

+        <text hidden="true" name="PLoss">P-Loss</text>

+        <text hidden="true" name="Ping">Ping</text>

+        <text hidden="true" name="AccountDetails">Account Details</text>

+        <text hidden="true" name="LBal">L$ bal</text>

+        <text hidden="true" name="Time">Time</text>

+        <text hidden="true" name="LocationDetails1">Location Details 1</text>

+        <text hidden="true" name="LocationDetails2">Location Details 2</text>

+        <text hidden="true" name="Region">Region</text>

+        <text hidden="true" name="Parcel">Parcel</text>

+        <text hidden="true" name="Pos">Pos</text>

+        <text hidden="true" name="Sqm">Sqm</text>

+        <text hidden="true" name="Owner">Owner</text>

+        <text hidden="true" name="Type">Type</text>

+        <text hidden="true" name="Yes">Yes</text>

+        <text hidden="true" name="No">No</text>

+        <text hidden="true" name="Forsale">ForSale</text>

+        <text hidden="true" name="Traffic">Traffic</text>

+        <text hidden="true" name="Last3ChatLines">Last 3 Chat Lines</text>

+        <text hidden="true" name="Last3IMLines">Last 3 IM Lines</text>

+</panel>                        
\ No newline at end of file
diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index 0bad2fc..192fcdb 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <alerts>
+        <global name="skipnexttime">Don't show me this again</global>
+        <global name="alwayschoose">Always choose this option</global>
+        
         <alert modal="true" name="MissingAlert">
                 <message name="message">
                         [ALERT_NAME] is missing from alerts.xml!
@@ -334,7 +337,7 @@ Community Standards.
         </alert>
         <alert modal="true" name="ClickPublishHelpAvatar">
                 <message name="message">
-                        Selecting the &quot;Publish in Search&quot; will show:
+                        Selecting &quot;Show in Search&quot; will show:
                         - my profile in search results
                         - a link to my profile in public group pages
                 </message>
@@ -3230,6 +3233,20 @@ from the &apos;Edit&apos; menu.
                         Cancel
                 </option>
         </alert>
+        <alert modal="true" name="TeleportFromLandmark">
+                <message name="message">
+                        Are you sure you want to teleport?
+                </message>
+                <ignore name="ignore">
+                        When teleporting from a landmark in inventory
+                </ignore>
+                <option name="Teleport">
+                        Teleport
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
         <alert name="MessageEstate" title="Message everyone in your Estate">
                 <message name="message">
                         Type a short announcement which will be
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about.xml b/linden/indra/newview/skins/xui/en-us/floater_about.xml
index 87833aa..40cdcf1 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about.xml
@@ -11,7 +11,7 @@
 
 In Memory of Jesse Malthus, you will be fondly remembered by all who heard your voice.
 
-Thank you to the following residents for helping to ensure that this is the best version yet: Aces Spade, Adrian Buckler, Adrienne LeShelle, Amanda Ascot, AnnaQuay Heart, Aquamina Khalifa, Arienne Anatine, Aston Hildyard, Ayami Kamachi, Badinage Odets, Biffy Berjis, Bigfox Pye, BigJohn Jade, BigRick Byrd, Brettus Tripsa, Brock Fitzgerald, Broker Allen, Browse by Name, Chiria Celt, Christopher Prudhomme, dale Cao, dale Lynch, Dante Tucker, DaQbet Kish, Dargon Pacer, Darius Antonelli, Deira Llanfair, DeviantBone Xi, Dore Dorado, Englishwob Etchegaray, Enya Masala, Eric Renneville, Fairfax Michinaga, FireFox Bancroft, FOXI Cortes, Frederick Earp, Geo Meek, Gotthilf Fischer, Hallo Loon, Hawk Carter, Hazel Kyrgyz, Hecter Barbosa, Hex Link, Ice Pak, Ideasu Mukerji, Itoku Kamachi, Jared Halleck, Jaykob Carter, Jennifer Drumheller, JensMartin Tomsen, JIAB Boa, Jim Gustafson, JimmyJet Fossett, Joseph Rustamova, Jt Volos, Karilyn Kidomen, Kaysha Sion, Keaton Nacon, Kevin Susenko, Khashai Steinbeck, Kira Cuddihy, Kit Massiel, Kojo Dixon, KUieTSToRm Lightcloud, Kwai Kyong, Kyrtis Daehlie, LazyGunGuy Bartlett, Lewcas Zapedzki, Lioc Cioc, LLIB Utu, Lou Liebknecht, Luca Draken, Maci Homewood, Major Sewell, Mari Todriya, MarieElize Noel, matt27 Churchill, Maverick Miasma, maydaysos Young, Mediaho Ball, Mikayla Gillespie, Mike Faulkland, Modfire Milland, MollyBrown Foxley, Mosley Jewell, Nuahs Zapedzki, Nyx Divine, Panther Farber, Paul Bumi, PrincessNina Prefect, Prio Serpentine, Rainbow Drake, Randall Rall, Randy Kazan, Reinhart Mokeev, Rhyph Somme, Rico Roizman, Ruge Dryke, Ryan Orbit, Safira Rosher, Samantha Bainbridge, Sammy Foxley, Sash Furst, Saturn Ariantho, Sienna Summers, Skye Enoch, Sofie Kanno, Solar Legion, Sonic Oki, Sunra Saenz, Taina Heart, Taryn Sprawl, tenerife Wei, TomDragon Nilsson, Trebla Reve, Trouble Carnell, user1cat Orbit, Vance Merlin, Veritas Variscan, Web Page, Wi3g3ht3s Ihnen, WinDrftr DeFarge, Yuu Nakamichi, Zac Delec, Zed Fairweather, Zimmo Hallard.
+Thank you to the following residents for helping to ensure that this is the best version yet: Aces Spade, Adrian Buckler, Adrienne LeShelle, Amanda Ascot, AnnaQuay Heart, Aquamina Khalifa, Arienne Anatine, Aston Hildyard, Ayami Kamachi, Badinage Odets, Biffy Berjis, Bigfox Pye, BigJohn Jade, BigRick Byrd, Brettus Tripsa, Brock Fitzgerald, Broker Allen, Browse by Name, Chiria Celt, Christopher Prudhomme, dale Cao, dale Lynch, Dante Tucker, DaQbet Kish, Dargon Pacer, Darius Antonelli, Deira Llanfair, DeviantBone Xi, Dore Dorado, Englishwob Etchegaray, Enya Masala, Eric Renneville, Fairfax Michinaga, FireFox Bancroft, FOXI Cortes, Frederick Earp, Geo Meek, Gotthilf Fischer, Hallo Loon, Hawk Carter, Hazel Kyrgyz, Hecter Barbosa, Hex Link, Ice Pak, Ideasu Mukerji, Itoku Kamachi, Jared Halleck, Jaykob Carter, Jennifer Drumheller, JensMartin Tomsen, JIAB Boa, Jim Gustafson, JimmyJet Fossett, Joseph Rustamova, Jt Volos, Karilyn Kidomen, Kaysha Sion, Keaton Nacon, Kevin Susenko, Khashai Steinbeck, Kira Cuddihy, Kit Massiel, Kojo Dixon, KUieTSToRm Lightcloud, Kwai Kyong, Kyrtis Daehlie, LazyGunGuy Bartlett, Lewcas Zapedzki, Lioc Cioc, LLIB Utu, Lou Liebknecht, Luca Draken, Maci Homewood, Major Sewell, Mari Todriya, MarieElize Noel, matt27 Churchill, Maverick Miasma, maydaysos Young, Mediaho Ball, Mikayla Gillespie, Mike Faulkland, Modfire Milland, MollyBrown Foxley, Mosley Jewell, Nuahs Zapedzki, Nyx Divine, Panther Farber, Paul Bumi, Preciousse Moody, PrincessNina Prefect, Prio Serpentine, Rainbow Drake, Randall Rall, Randy Kazan, Reinhart Mokeev, Rhyph Somme, Rico Roizman, Ruge Dryke, Ryan Orbit, Safira Rosher, Samantha Bainbridge, Sammy Foxley, Sash Furst, Saturn Ariantho, Sienna Summers, Skye Enoch, Sofie Kanno, Solar Legion, Sonic Oki, Sunra Saenz, Taina Heart, Taryn Sprawl, tenerife Wei, TomDragon Nilsson, Trebla Reve, Trouble Carnell, user1cat Orbit, Vance Merlin, Veritas Variscan, Web Page, Wi3g3ht3s Ihnen, WinDrftr DeFarge, Yuu Nakamichi, Zac Delec, Zed Fairweather, Zimmo Hallard.
 
 APR Copyright (C) 2000-2004 The Apache Software Foundation
 cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
index 3a877ea..eb5448f 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
@@ -557,11 +557,11 @@
                              width="119" />
                         <check_box bottom="-140" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" hidden="false" initial_value="false"
-                             label="Show in Search &gt; Places (L$30/week) under" left="14"
+                             label="Show Place in Search (L$30/week) under" left="14"
                              mouse_opaque="true" name="ShowDirectoryCheck" radio_style="false"
                              width="268" tool_tip="Let people see this parcel in search results"/>
                         <combo_box allow_text_entry="false" bottom="-140" enabled="true" follows="left|top"
-                             height="18" hidden="false" left="260" max_chars="20" mouse_opaque="true"
+                             height="18" hidden="false" left="255" max_chars="20" mouse_opaque="true"
                              name="land category" width="130">
                                 <combo_item name="AnyCategory" value="any">
                                         Any Category
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 7068b82..6f253a1 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -1,54 +1,100 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="570" min_height="200" min_width="400"
-     name="directory" rect_control="FloaterFindRect2" title="Search" width="780">
+     can_resize="true" height="570" min_height="570" min_width="780"
+     name="directory" rect_control="FloaterFindRect2"
+     title="Search Second Life" width="780">
         <tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0"
              mouse_opaque="false" name="Directory Tabs" tab_position="top" width="780">
+             
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-                     label="All" left="1" mouse_opaque="false" name="all_panel" width="778">
-                                                <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-                             height="20" label="Next &gt;" label_selected="Next &gt;" right="344"
-                             mouse_opaque="true" name="Next &gt;" width="80" />
-                        <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-                             height="20" label="&lt; Prev" label_selected="&lt; Prev" right="258"
-                             mouse_opaque="true" name="&lt; Prev" 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" />
-                        <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"
+                     label="All" left="1" mouse_opaque="false"
+                     name="find_all_panel"
+                     width="778">
+                        <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" />
+                        <combo_box allow_text_entry="false"
+                                bottom_delta="0" follows="right|top" height="18"
+                                left_delta="100"
+                             max_chars="20" mouse_opaque="true" name="Category"
+                             width="128">
+                                <combo_item name="AnyCategory" value="All">
+                                        Any Category
+                                </combo_item>
+                                <combo_item name="Classifieds" value="Classifieds">
+                                        Classifieds
+                                </combo_item>
+                                <combo_item name="Events" value="Events">
+                                        Events
+                                </combo_item>
+                                <combo_item name="Groups" value="Groups">
+                                        Groups
+                                </combo_item>
+                                <combo_item name="People" value="People">
+                                        People
+                                </combo_item>
+                                <combo_item name="Places" value="Places">
+                                        Places
+                                </combo_item>
+                                <combo_item name="Wiki" value="Wiki">
+                                        Wiki
+                                </combo_item>
+                        </combo_box>
+                        <check_box bottom_delta="0"
+                                control_name="ShowMatureFindAll" follows="right|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="false" bottom="-513" column_padding="0" draw_border="true"
-                             draw_heading="false" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
-                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
-                             multi_select="false" name="results" search_column="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" />
+                             label="Include Mature content"
+                             left_delta="133"
+                             name="mature_check"
+                             width="156" />
+                        <web_browser name="find_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" />
+                        <text hidden="true" name="loading_text">Loading...</text>
+                        <text hidden="true" name="done_text">Done</text>
                 </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">
@@ -65,13 +111,13 @@
                                 Find:
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-                             follows="left|top" font="SansSerif" height="18" left_delta="30"
-                             max_length="63" mouse_opaque="true" name="name" width="136" />
+                             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="ShowMatureClassifieds" follows="left|top"
                              font="SansSerifSmall" height="16" initial_value="true"
-                             label="Include Mature content" left="32" mouse_opaque="true"
+                             label="Include Mature content" left_delta="0" mouse_opaque="true"
                              name="incmature" width="156" />
-                        <combo_box allow_text_entry="false" bottom="-24" follows="left|top" height="18" left="174"
+                        <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="0">
                                         Any Category
@@ -110,9 +156,9 @@
                         <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Search" label_selected="Search" mouse_opaque="true"
                              name="Search" width="70" visible="false"/>
-                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
-                             label="Place an Ad..." label_selected="Place an Ad..." left_delta="320"
-                             mouse_opaque="true" name="Place an Ad..." width="123" />
+                        <button bottom="-26" follows="right|top" font="SansSerif" halign="center" height="20"
+                             label="Place an Ad..." label_selected="Place an Ad..." left="-140"
+                             mouse_opaque="true" name="Place an Ad..." width="125" />
                         <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Delete" label_selected="Delete" left="80"
                              mouse_opaque="true" name="Delete" width="80" />
@@ -131,6 +177,7 @@
                              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" default_tab_group="1"
                      follows="left|top|right|bottom" height="533" label="Events" left="1"
                      mouse_opaque="false" name="events_panel" width="778">
@@ -233,7 +280,7 @@
                              font="SansSerifSmall" height="16" initial_value="false" label="Show Mature"
                              left="569" mouse_opaque="true" name="incmature" width="120" />
                         <button bottom="-28" follows="left|top" font="SansSerif" halign="center" height="20"
-                             label="Search" label_selected="Search" left_delta="120" mouse_opaque="true"
+                             label="Search" label_selected="Search" left_delta="100" mouse_opaque="true"
                              name="Search" tool_tip="Search" width="80" />
                         <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Delete" label_selected="Delete" left="80"
@@ -245,7 +292,7 @@
                              multi_select="false" name="results" search_column="2" width="339">
                                 <column label="" name="icon" width="24" />
                                 <column label="" name="type" width="-1" />
-                                <column label="Name" name="name" width="178" />
+                                <column label="Name" name="name" dynamicwidth="true" />
                                 <column label="Time (PT)" name="date" sort="time" width="106" />
                                 <column label="" name="event_id" width="-1" />
                                 <column label="Time" name="time" width="-1" />
@@ -279,7 +326,7 @@
                              label="Include parcels with Mature 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="left|top"
+                             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."
@@ -294,7 +341,7 @@ the amount of time people spend there.
                              multi_select="false" name="results" search_column="2" width="339">
                                 <column label="" name="icon" width="24" />
                                 <column label="" name="type" width="-1" />
-                                <column label="Name" name="name" width="215" />
+                                <column label="Name" name="name" dynamicwidth="true" />
                                 <column label="Traffic" name="dwell" width="70" />
                         </scroll_list>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -369,7 +416,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                              multi_select="false" name="results" search_column="2" width="387">
                                 <column label="" name="icon" width="24" />
                                 <column label="" name="type" width="-1" />
-                                <column label="Name" name="name" width="164" />
+                                <column label="Name" name="name" dynamicwidth="true" />
                                 <column label="L$ Price" name="price" width="65" />
                                 <column label="Area" name="area" width="50" />
                                 <column label="L$/sq.m" name="per_meter" width="65" />
@@ -399,9 +446,9 @@ To buy direct, visit the land and click on the place name in the title bar.
                              max_length="63" mouse_opaque="true" name="name" width="128" />
                         <check_box bottom_delta="-18" control_name="ShowMatureSims" follows="left|top"
                              font="SansSerifSmall" height="16" initial_value="false"
-                             label="Include parcels with Mature content" left="42" mouse_opaque="true"
+                             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="178"
+                        <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
@@ -446,14 +493,26 @@ To buy direct, visit the land and click on the place name in the title bar.
                         <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
                              name="Search" width="70" />
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
-                             draw_heading="true" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
-                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
-                             multi_select="false" name="results" search_column="2" width="339">
+                        <scroll_list 
+                                 name="results" 
+                                 background_visible="false" 
+                                 bottom="-513" 
+                                 column_padding="0" 
+                                 draw_border="true"
+                             draw_heading="true" 
+                             fg_disable_color="1, 1, 1, 1"
+                             fg_selected_color="1, 1, 1, 1" 
+                             fg_unselected_color="1, 1, 1, 1"
+                             follows="left|top|right|bottom" 
+                             height="464" 
+                             left="4" 
+                             mouse_opaque="true"
+                             multi_select="false"
+                             search_column="2" 
+                             width="339">
                                 <column label="" name="icon" width="24" />
                                 <column label="" name="type" width="-1" />
-                                <column label="Name" name="name" width="215" />
+                                <column label="Name" name="name" dynamicwidth="true" />
                                 <column label="Traffic" name="dwell" width="75" />
                         </scroll_list>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -529,8 +588,8 @@ To buy direct, visit the land and click on the place name in the title bar.
                              multi_select="false" name="results" search_column="2" width="339">
                                 <column label="" name="icon" width="24" sort="score" sort_ascending="false" />
                                 <column label="" name="type" width="-1" />
-                                <column label="Name" name="name" width="184" />
-                                <column label="Members" name="members" width="100" halign="right" sort_ascending="false" />
+                                <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_drop_shadow_visible="false" border_visible="false"
@@ -538,15 +597,60 @@ 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="All (old)" left="1" mouse_opaque="false"
+                     name="find_all_old_panel" width="778">
+                        <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="false" bottom="-513" column_padding="0" draw_border="true"
+                             draw_heading="false" fg_disable_color="1, 1, 1, 1"
+                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
+                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+                             multi_select="false" name="results" search_column="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>
         </tab_container>
-        <panel bottom="0" height="470" left="340" name="classified_details_panel" width="440" />
-        <panel bottom="-550" height="486" left="350" name="Panel Avatar" width="430" />
-        <panel bottom="0" height="470" left="340" name="event_details_panel" width="440" />
-        <panel bottom="0" height="515" left="350" name="group_details_panel_holder"
-             width="430">
-                <panel bottom="0" height="470" left="0" name="group_details_panel" width="430" />
+        <panel follows="right|top" bottom="-560" height="470" left="340" name="classified_details_panel" width="440" />
+        <panel follows="right|top" bottom="-560" height="486" left="350" name="Panel Avatar" width="430" />
+        <panel follows="right|top" bottom="-560" height="470" left="340" name="event_details_panel" width="440" />
+        <panel follows="right|top" bottom="-580" height="515" left="350" name="group_details_panel_holder" width="430">
+                <panel follows="right|top" bottom="0" height="470" left="0" name="group_details_panel" width="430" />
         </panel>
-        <panel bottom="20" height="470" left="340" name="place_details_panel" width="440" />
-        <panel bottom="20" height="470" left="385" name="place_details_small_panel"
+        <panel follows="right|top" bottom="20" height="470" left="340" name="place_details_panel" width="440" />
+        <panel follows="right|top" bottom="20" height="470" left="385" name="place_details_small_panel"
              width="395" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_html_help.xml b/linden/indra/newview/skins/xui/en-us/floater_html_help.xml
index fa5a7db..91c0873 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_html_help.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_html_help.xml
@@ -5,15 +5,21 @@
         <button bottom="-45" follows="top|left" font="SansSerifSmall" height="20" label="Back"
              left="15" name="back_btn" width="70" />
         <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-             label="Home" left_delta="75" name="home_btn" width="70" />
-        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
              label="Forward" left_delta="75" name="forward_btn" width="70" />
-        <button bottom="10" follows="bottom|right" font="SansSerifSmall" height="20"
-             label="Close" name="close_btn" right="-10" width="50" />
-        <web_browser bottom="40" follows="top|left|bottom|right" font="SansSerifSmall" left="15"
-             name="html_help_browser" right="-15" top="-55" start_url="http://secondlife.com/app/help/" />
-        <text bottom="5" follows="bottom|left|right" left="15" name="status_text" right="-70"
-             top="25">
-                Done
+        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
+             label="Home" left_delta="75" name="home_btn" width="70" />
+        <text bottom_delta="5"
+                follows="top|left|right"
+                left_delta="100"
+                name="status_text"
+                right="-5"
+                height="16">
+                Ready
         </text>
+        <web_browser name="html_help_browser"
+                bottom="10"
+                follows="top|left|bottom|right"
+                font="SansSerifSmall"
+                left="15"
+            right="-15" top="-55" start_url="http://secondlife.com/app/help/" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml b/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
index 0aa42cb..9e2c410 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
@@ -362,7 +362,7 @@
                         600

                 </text>

                 <text hidden="true" name="network_ping_warning_ms">

-                        250

+                        300

                 </text>

                 <text hidden="true" name="network_ping_critical_msg">

                         Connection ping time is over [NETWORK_PING_CRITICAL] ms

@@ -423,4 +423,4 @@
     <text hidden="true" name="bigger_label">

       &lt;&lt;

     </text>

-</floater>
\ No newline at end of file
+</floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_landmark_ctrl.xml b/linden/indra/newview/skins/xui/en-us/floater_landmark_ctrl.xml
new file mode 100644
index 0000000..07a709a
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_landmark_ctrl.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-516" can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="true" can_tear_off="true" enabled="true" height="320"
+     hidden="false" left="478" min_height="310" min_width="241" rect_control="FloaterLandmarkRect" 
+     mouse_opaque="true" name="landmarkpicker" title="Organize: Landmarks" width="310">
+        <check_box bottom="-44" enabled="true" follows="left|top" font="SansSerifSmall"
+             height="24" hidden="false" initial_value="true" label="Show Folders"
+             left="175" mouse_opaque="true" name="show_folders_check"
+             radio_style="false" width="201" />
+        <search_editor bottom="-36" enabled="true" follows="left|top" height="16" hidden="false"
+             left="20" mouse_opaque="true" name="inventory search editor" width="231" />
+        <inventory_panel allow_multi_select="false" border="true" bottom="-256" enabled="true"
+             follows="left|top|right|bottom" height="216" hidden="false" left="20"
+             mouse_opaque="true" name="inventory panel"
+             sort_order="TexturePickerSortOrder" width="231" />
+        <button bottom="-282" enabled="true" follows="bottom" font="SansSerif"
+             halign="center" height="20" hidden="false" label="New"
+             label_selected="New" left="20" mouse_opaque="true" name="New"
+             scale_image="true" width="100" />
+        <button bottom="-282" enabled="true" follows="bottom" font="SansSerif"
+             halign="center" height="20" hidden="false" label="Rename"
+             label_selected="Rename" left="125" mouse_opaque="true" name="Rename"
+             scale_image="true" width="100" />
+        <button bottom="-282" enabled="true" follows="bottom" font="SansSerif"
+             halign="center" height="20" hidden="false" label="New Folder"
+             label_selected="New Folder" left="230" mouse_opaque="true" name="NewFolder"
+             scale_image="true" width="100" />
+        <button bottom="-307" enabled="true" follows="bottom" font="SansSerif"
+             halign="center" height="20" hidden="false" label="Edit"
+             label_selected="Edit" left="20" mouse_opaque="true" name="Edit"
+             scale_image="true" width="100" />
+        <button bottom="-307" enabled="true" follows="bottom" font="SansSerif"
+             halign="center" height="20" hidden="false" label="Delete"
+             label_selected="Delete" left="125" mouse_opaque="true" name="Delete"
+             scale_image="true" width="100" />
+        <button bottom="-307" enabled="true" follows="bottom" font="SansSerif"
+             halign="center" height="20" hidden="false" label="Close"
+             label_selected="Close" left="230" mouse_opaque="true" name="Close"
+             scale_image="true" width="100" />
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_classified.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_classified.xml
new file mode 100644
index 0000000..5a6e739
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_classified.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" enabled="true" height="510" hidden="false" left="242"
+     min_height="480" min_width="450" mouse_opaque="true"
+     name="classified_preview" width="440" title="Classified Information" rect_control="PreviewClassifiedRect">
+  <panel follows="bottom|left" bottom="20" height="470" left="0" name="classified_details_panel" width="440" />
+
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_event.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_event.xml
new file mode 100644
index 0000000..2eaebfe
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_event.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" enabled="true" height="510" hidden="false" left="242"
+     min_height="480" min_width="450" mouse_opaque="true"
+     name="event_preview" width="440" title="Event Information" rect_control="PreviewEventRect">
+  <panel follows="bottom|left" bottom="20" height="470" left="0" name="event_details_panel" width="440" />
+
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_existing_landmark.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_existing_landmark.xml
index 7d7d435..cbf5da4 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_existing_landmark.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_existing_landmark.xml
@@ -1,28 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="90" hidden="false" left="242"
-     min_height="90" min_width="300" mouse_opaque="true"
-     name="existing_landmark_preview" width="300">
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-43"
-             enabled="true" follows="left|top|right" font="SansSerif"
-             handle_edit_keys_directly="false" height="19" hidden="false" left="13"
-             max_length="127" mouse_opaque="true" name="desc"
-             select_all_on_focus_received="false" select_on_focus="false" width="274" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerif" h_pad="0" halign="left" height="19" hidden="false"
-             left="13" mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-                Description:
-        </text>
-        <icon bottom="-21" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-             hidden="false" image_name="inv_item_landmark_visited.tga" left="5"
-             mouse_opaque="true" name="icon_landmark" width="16" />
-        <button bottom="-77" enabled="true" follows="left|bottom" font="SansSerif"
-             halign="center" height="20" hidden="false" label="Teleport"
-             label_selected="" left="13" mouse_opaque="true" name="Teleport btn"
-             width="100" />
-        <button bottom="-77" enabled="true" follows="left|bottom" font="SansSerif"
-             halign="center" height="20" hidden="false" label="Show on Map"
-             label_selected="" left="126" mouse_opaque="true" name="Show on Map btn"
-             width="100" />
+     can_resize="false" enabled="true" height="495" hidden="false" left="242"
+     min_height="510" min_width="460" mouse_opaque="true"
+     name="existing_landmark_preview" width="440">
+  <panel follows="bottom|left" bottom="0" height="475" left="0" name="place_details_panel" width="440" />
+
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_url.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_url.xml
new file mode 100644
index 0000000..fcc04c5
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_url.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" enabled="true" height="495" hidden="false" left="242"
+     mouse_opaque="true"
+     name="url_preview" width="440" title="Place Information" rect_control="PreviewURLRect">
+  <panel follows="bottom|left" bottom="0" height="475" left="0" name="place_details_panel" width="440" />
+
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
index a2ad5f1..cb237fa 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
@@ -426,7 +426,7 @@
                              hidden="false" initial_value="false" label="Allow anyone to copy" left="10"
                              mouse_opaque="true" name="checkbox allow everyone copy" width="141" />
                         <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Show in Search" left="10"
+                             initial_value="false" label="Show in search" left="10"
                              name="search_check" tool_tip="Let people see this object in search results" width="78" />
                         <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
                              hidden="false" initial_value="false" label="For Sale" left="10"
diff --git a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
index a57a8b6..c13b81e 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
@@ -184,9 +184,9 @@
                 <on_click filter="" function="Inventory.DoToSelected" userdata="open" />
         </menu_item_call>
         <menu_item_separator name="Landmark Separator" />
-        <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Teleport To Landmark"
+        <menu_item_call bottom_delta="-18" height="18" hidden="false" label="About Landmark"
              left="0" mouse_opaque="true" name="Teleport To Landmark" width="128">
-                <on_click filter="" function="Inventory.DoToSelected" userdata="teleport" />
+                <on_click filter="" function="Inventory.DoToSelected" userdata="about" />
         </menu_item_call>
         <menu_item_separator name="Animation Separator" />
         <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Play in World" left="0"
diff --git a/linden/indra/newview/skins/xui/en-us/menu_slurl.xml b/linden/indra/newview/skins/xui/en-us/menu_slurl.xml
new file mode 100644
index 0000000..0682334
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/menu_slurl.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu bottom="100" color="0, 0, 0, 1" drop_shadow="true" height="101" hidden="false"
+     left="100" mouse_opaque="false" name="Popup" opaque="true" width="128">
+        <menu_item_separator name="Landmark Separator" />
+        <menu_item_call bottom_delta="-18" height="18" hidden="false" label="About URL"
+             left="0" mouse_opaque="true" name="about_url" width="128">
+                <on_click filter="" function="Inventory.DoToSelected" userdata="about" />
+        </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Teleport to URL"
+             left="0" mouse_opaque="true" name="teleport_to_url" width="128">
+                <on_click filter="" function="Inventory.DoToSelected" userdata="about" />
+        </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Show on Map"
+             left="0" mouse_opaque="true" name="show_on_map" width="128">
+                <on_click filter="" function="Inventory.DoToSelected" userdata="about" />
+        </menu_item_call>
+</menu>
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 cb6835c..3b289d4 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
@@ -810,7 +810,7 @@
                         left="0" mouse_opaque="true" name="separator7" width="250" />
                         <menu bottom="-554" drop_shadow="true" enabled="true" height="109"
                      hidden="false" label="Bug Reporting" left="0" mouse_opaque="false"
-                     name="Select Tool" opaque="true" tear_off="true" create_jump_keys="true"
+                     name="Bug Reporting" opaque="true" tear_off="true" create_jump_keys="true"
                      width="118">
                         <menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
                      label="Public Issue Tracker..." left="0" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/xui/en-us/notify.xml b/linden/indra/newview/skins/xui/en-us/notify.xml
index 5bf5c78..ad9e049 100644
--- a/linden/indra/newview/skins/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/xui/en-us/notify.xml
@@ -960,6 +960,11 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
                         [VOICE_CHANNEL_NAME] is not available to take your call.  You will now be reconnected to spatial voice chat.
                 </message>
         </notify>
+        <notify name="VoiceChannelJoinFailed" tip="true" unique="true">
+                <message name="message">
+                        Failed to connect to [VOICE_CHANNEL_NAME], please try again later.  You will now be reconnected to spatial voice chat.
+                </message>
+        </notify>
         <notify name="VoiceLoginRetry" tip="true" unique="true" duration="10">
                 <message name="message">
                         We are creating a voice channel for you. This may take up to one minute.
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
index 2e16380..fa64706 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
@@ -62,7 +62,7 @@
                              mouse_opaque="true" name="label2" v_pad="0" width="121">
                                 Account:
                         </text>
-                        <view_border blevel_style="in" bottom_delta="-32" follows="left|top" height="32" left="279"
+                        <view_border bevel_style="in" bottom_delta="-32" follows="left|top" height="32" left="279"
                              mouse_opaque="false" name="acct_border" width="121" />
                         <text bg_color="0, 0, 0, 0" bg_visible="false" border_drop_shadow_visible="false"
                              border_visible="true" bottom_delta="0" drop_shadow_visible="true"
@@ -144,7 +144,7 @@
                                 Drop inventory item here.
                         </text>
                         <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Show In Search" left="75"
+                             initial_value="false" label="Show in search" left="75"
                              mouse_opaque="true" name="allow_publish"
                              tool_tip="Publish extra profile information such as description and image in Search." width="130" />
                         <button bottom="-423" follows="left|top" font="SansSerif" halign="center" height="16"
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 05252ab..fb1e082 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
@@ -79,25 +79,25 @@ Hover your mouse over the options for more help.
              bottom_delta="-104" follows="left|top" height="96" left_delta="0"
              mouse_opaque="true" name="preferences_container" width="404">
                 <check_box bottom="-20" follows="left|top" font="SansSerifSmall" height="16"
-                     initial_value="true" label="Show In Search" left="4"
+                     initial_value="true" label="Show in search" left="4"
                      mouse_opaque="true" name="show_in_group_list" radio_style="false"
                      text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
                      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"
+                     initial_value="false" label="Mature group" left_delta="0" mouse_opaque="true"
                      name="mature" radio_style="false"
                      text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
                      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"
+                     initial_value="false" label="Open enrollment" left="4"
                      mouse_opaque="true" name="open_enrollement" radio_style="false"
                      text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
                      tool_tip="Sets whether this group allows new members to join   without being invited."
                      width="95" />
                 <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-                     initial_value="false" label="Enrollment Fee: L$" left_delta="16"
+                     initial_value="false" label="Enrollment fee: L$" left_delta="16"
                      max_length="5" mouse_opaque="true" name="check_enrollment_fee"
                      radio_style="false" text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
                      tool_tip="Sets whether to require an enrollment fee to join the group."
@@ -121,12 +121,12 @@ Hover your mouse over the options for more help.
                              tool_tip="Sets the title that appears in your avatar&apos;s name tag   when this group is active." />
                 </panel>
                 <check_box follows="left|top" font="SansSerifSmall" height="16" bottom_delta="-25"
-                     initial_value="false" label="Receive Group Notices" left_delta="0"
+                     initial_value="false" label="Receive group notices" left_delta="0"
                      mouse_opaque="true" name="receive_notices" radio_style="false"
                      tool_tip="Sets whether you want to receive Notices from this group.   Uncheck this box if this group is spamming you."
                      width="95" />
                 <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-                     initial_value="false" label="List Group in Profile" left_delta="0"
+                     initial_value="false" label="List group in my profile" left_delta="0"
                      mouse_opaque="true" name="list_groups_in_profile" radio_style="false"
                      tool_tip="Sets whether you want to list this group in your Profile"
                      width="95" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_place.xml b/linden/indra/newview/skins/xui/en-us/panel_place.xml
index 06efe6c..479e8be 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_place.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_place.xml
@@ -1,29 +1,53 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="false" bottom="20" can_close="true" can_minimize="true"
-     can_resize="false" follows="bottom|left" height="470" left="330"
+     can_resize="false" follows="bottom|left" height="400" left="330"
      name="Place" title="Place" width="450">
-        <texture_picker bottom="-315" follows="left|top" height="300" left="20" name="snapshot_ctrl"
+        <texture_picker bottom="95" follows="left|top" height="300" left="20" name="snapshot_ctrl"
              width="400" />
-        <line_editor bg_readonly_color="clear" bottom_delta="-8" enabled="false" follows="left|top"
-             font="SansSerif" height="20" left="20" name="name_editor"
-             text_readonly_color="white" width="400" />
-        <text_editor bg_readonly_color="clear" enabled="false" follows="left|top" font="SansSerif"
+        <text bottom_delta="-10" follows="left|top"
+             font="SansSerif" height="20" left="20">
+                                Name:
+        </text>
+        <text bottom_delta="0" follows="left|top"
+             font="SansSerif" height="20" left="60" name="name_editor"
+             text_color="white"
+             width="361" />
+             
+        <text bottom_delta="-20" follows="left|top"
+             font="SansSerif" height="20" left="20">
+                                Description:
+        </text>
+        <text_editor bottom_delta="-68" bg_readonly_color="clear" enabled="false" follows="left|top" font="SansSerif"
              height="70" left="20" max_length="1023" name="desc_editor"
-             text_readonly_color="white" width="400" word_wrap="true" />
-        <line_editor bg_readonly_color="clear" enabled="false" follows="left|top" font="SansSerif"
-             height="20" left="20" name="info_editor" text_readonly_color="white"
-             width="400" />
-        <line_editor bg_readonly_color="clear" enabled="false" follows="left|top" font="SansSerif"
-             height="20" left="20" name="location_editor" text_readonly_color="white"
-             width="400" />
-        <button bottom_delta="-30" follows="left|top" height="20" label="Teleport" left="20"
-             name="teleport_btn" width="120" />
-        <button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="150"
+             text_readonly_color="white" width="400" word_wrap="true"></text_editor>
+             
+        <text bottom_delta="-25" follows="left|top"
+             font="SansSerif" height="20" left="20">
+                                Information:
+        </text>
+        <text bottom_delta="0" follows="left|top" font="SansSerif"
+                text_color="white"
+             height="20" left="95" name="info_editor" width="328"  />
+             
+        <text bottom_delta="-20" follows="left|top"
+             font="SansSerif" height="20" left="20">
+                                Location:
+        </text>
+        <text bottom_delta="0" follows="left|top" font="SansSerif"
+             height="20" left="95" name="location_editor"
+             width="342" text_color="white" />
+             
+        <button bottom_delta="-20" follows="left|top" height="20" label="Teleport" left="20"
+             name="teleport_btn" width="100" />
+        <button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="130"
              name="map_btn" width="100" />
         <button bottom_delta="0" follows="left|top" height="20" label="Bids..." left="275"
              name="auction_btn" width="80" />
-        <string name="traffic_text">Traffic: [TRAFFIC]</string>
-        <string name="area_text">, Area: [AREA] sq. m.</string>
-        <string name="forsale_text">, For Sale for L$ [PRICE]</string>
-        <string name="auction_text">, Auction ID [ID].</string>
+        <string name="traffic_text">Traffic: [TRAFFIC] </string>
+        <string name="area_text"> Area: [AREA] sq. m. </string>
+        <string name="forsale_text"> For Sale for L$ [PRICE] </string>
+        <string name="auction_text"> Auction ID [ID]. </string>
+        <text hidden="true" name="server_update_text">Place information not available without server update.</text>
+        <text hidden="true" name="server_error_text">Information about this location is unavailable at this time, please try again later.</text>
+        <text hidden="true" name="server_forbidden_text">Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.</text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_place_small.xml b/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
index f7523df..0b846f1 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
@@ -1,29 +1,53 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="false" bottom="20" can_close="true" can_minimize="true"
-     can_resize="false" follows="bottom|left" height="470" left="380"
+     can_resize="false" follows="bottom|left" height="400" left="380"
      name="Place" title="Place" width="450">
-        <texture_picker bottom="-285" follows="left|top" height="270" left="20" name="snapshot_ctrl"
+        <texture_picker bottom="-274" follows="left|top" height="270" left="20" name="snapshot_ctrl"
              width="360" />
-        <line_editor bg_readonly_color="clear" bottom_delta="-8" enabled="false" follows="left|top"
-             font="SansSerif" height="20" left="20" name="name_editor"
-             text_readonly_color="white" width="360" />
-        <text_editor bg_readonly_color="clear" enabled="false" follows="left|top" font="SansSerif"
+        <text bottom_delta="-12" follows="left|top"
+             font="SansSerif" height="20" left="20">
+                                Name:
+        </text>
+        <text bottom_delta="0" follows="left|top"
+             font="SansSerif" height="20" left="60" name="name_editor"
+             text_color="white"
+             width="320" />
+             
+        <text bottom_delta="-24" follows="left|top"
+             font="SansSerif" height="20" left="20">
+                                Description:
+        </text>
+        <text_editor bottom_delta="-68" bg_readonly_color="clear" enabled="false" follows="left|top" font="SansSerif"
              height="70" left="20" max_length="1023" name="desc_editor"
-             text_readonly_color="white" width="360" word_wrap="true" />
-        <line_editor bg_readonly_color="clear" enabled="false" follows="left|top" font="SansSerif"
-             height="20" left="20" name="info_editor" text_readonly_color="white"
-             width="360" />
-        <line_editor bg_readonly_color="clear" enabled="false" follows="left|top" font="SansSerif"
-             height="20" left="20" name="location_editor" text_readonly_color="white"
-             width="360" />
-        <button bottom_delta="-30" follows="left|top" height="20" label="Teleport" left="20"
+             text_readonly_color="white" width="360" word_wrap="true"></text_editor>
+             
+        <text bottom_delta="-30" follows="left|top"
+             font="SansSerif" height="20" left="20">
+                                Information:
+        </text>
+        <text bottom_delta="0" follows="left|top" font="SansSerif"
+                text_color="white"
+             height="20" left="95" name="info_editor" width="328"  />
+             
+        <text bottom_delta="-30" follows="left|top"
+             font="SansSerif" height="20" left="20">
+                                Location:
+        </text>
+        <text bottom_delta="0" follows="left|top" font="SansSerif"
+             height="20" left="95" name="location_editor"
+             width="342" text_color="white" />
+             
+        <button bottom_delta="-25" follows="left|top" height="20" label="Teleport" left="20"
              name="teleport_btn" width="100" />
-        <button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="125"
+        <button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="130"
              name="map_btn" width="100" />
         <button bottom_delta="0" follows="left|top" height="20" label="Bids..." left="275"
              name="auction_btn" width="80" />
-        <string name="traffic_text">Traffic: [TRAFFIC]</string>
-        <string name="area_text">, Area: [AREA] sq. m.</string>
-        <string name="forsale_text">, For Sale for L$ [PRICE]</string>
-        <string name="auction_text">, Auction ID [ID].</string>
+        <string name="traffic_text">Traffic: [TRAFFIC] </string>
+        <string name="area_text"> Area: [AREA] sq. m. </string>
+        <string name="forsale_text"> For Sale for L$ [PRICE] </string>
+        <string name="auction_text"> Auction ID [ID]. </string>
+        <text hidden="true" name="server_update_text">Place information not available without server update.</text>
+        <text hidden="true" name="server_error_text">Information about this location is unavailable at this time, please try again later.</text>
+        <text hidden="true" name="server_forbidden_text">Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.</text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_LCD.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_LCD.xml
new file mode 100644
index 0000000..bd2eeba
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_LCD.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

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

+     height="408" hidden="false" label="Logitech LCD" left="102"

+     mouse_opaque="true" name="LCD Options" width="517">

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

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

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

+             left="10" mouse_opaque="true" name="LCD Destination:" v_pad="0"

+             width="266">

+                 LCD Destination:

+        </text>

+        

+        <radio_group bottom="-45" control_name="LCDDestination" draw_border="true" enabled="true"

+             follows="left|top" height="36" hidden="false" left="148"

+             mouse_opaque="true" name="LCDDestination" width="193">

+                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"

+                        tool_tip="Display forms selected appear on Logitech G15 Keyboard LCD"

+                    left="3" mouse_opaque="true" name="DestinationG15" width="463">

+                        Logitech G15 Gaming Keyboard

+                </radio_item>

+                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"

+                        tool_tip="Display forms selected appear on Logitech Z10 Speaker LCD"

+                    left="3" mouse_opaque="true" name="DestinationZ10" width="463">

+                        Logitech Z10 Speakers

+                </radio_item>

+        </radio_group>

+        

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

+             bottom="-68" drop_shadow_visible="true" enabled="true" follows="left|top"

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

+             left="10" mouse_opaque="true" name="LCD Display Options" v_pad="0"

+             width="266">

+                LCD Display Options:

+        </text>

+        <check_box bottom="-72" control_name="DisplayChat" enabled="true" follows="left|top"

+             font="SansSerifSmall" height="16" hidden="false" label="Display Chat"

+             left="148" mouse_opaque="true" name="DisplayChat" radio_style="false"

+             tool_tip="Display Last Chat line in LCD Window"

+             width="128" />

+        <check_box bottom="-90" control_name="DisplayIM" enabled="true"

+             follows="left|top" font="SansSerifSmall" height="16" hidden="false"

+             initial_value="false" label="Display IM's"

+             left="148" mouse_opaque="true" name="DisplayIM"

+             radio_style="false"

+             tool_tip="Display Last IM in LCD Window" width="242" />         

+        <check_box bottom="-108" control_name="DisplayRegion" enabled="true"

+             follows="left|top" font="SansSerifSmall" height="16" hidden="false"

+             initial_value="false" label="Show Location Information" left="148"

+             mouse_opaque="true" name="DisplayRegion" radio_style="false"

+             tool_tip="Display current location information in LCD Window"

+             width="201" />

+        <check_box bottom="-126" control_name="DisplayLinden" enabled="true"

+             follows="left|top" font="SansSerifSmall" height="16" hidden="false"

+             initial_value="false" label="Show Account Information" left="148"

+             mouse_opaque="true" name="DisplayLinden" radio_style="false"

+             tool_tip="Display current account information in LCD Window"

+             width="201" />          

+        <check_box bottom="-144" control_name="DisplayDebug" enabled="true"

+             follows="left|top" font="SansSerifSmall" height="16" hidden="false"

+             initial_value="false" label="Display Network Comms Info"

+             left="148" mouse_opaque="true" name="DisplayDebug"

+             radio_style="false"

+             tool_tip="Display debug information in LCD Window" width="242" />

+        <check_box bottom="-162" control_name="DisplayDebugConsole" enabled="true"

+             follows="left|top" font="SansSerifSmall" height="16" hidden="false"

+             initial_value="false" label="Display Debug Info from Console"

+             left="148" mouse_opaque="true" name="DisplayDebugConsole"

+             radio_style="false"

+             tool_tip="Display console debug information in LCD Window" width="242" />

+</panel>

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 045be99..e02f1f6 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
@@ -35,7 +35,7 @@
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
              left="205" name="parcel_changes_help" width="18" />
         <check_box bottom_delta="-20" follows="left|top" height="20"
-             label="Block Parcel Search" left="10" tool_tip="Let people see this region and its parcels in
+             label="Block Land Show in Search" left="10" tool_tip="Let people see this region and its parcels in
 search results" name="block_parcel_search_check" width="80" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
              left="205" name="parcel_search_help" width="18" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
index 51338f1..30bb347 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
@@ -15,7 +15,7 @@
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-20" disabled_color="0 1 0 1" drop_shadow_visible="true"
              enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
-             halign="right" height="18" hidden="false" left="-120" mouse_opaque="true"
+             halign="right" height="18" hidden="false" left="-210" mouse_opaque="true"
              name="BalanceText" text_color="0 1 0 1" tool_tip="Account Balance"
              v_pad="2" width="76">
                 Loading...
@@ -26,13 +26,13 @@
              image_disabled_selected="status_buy_currency_pressed.tga"
              image_selected="status_buy_currency_pressed.tga"
              image_unselected="status_buy_currency.tga" label="" label_selected=""
-             left="-120" mouse_opaque="true" name="buycurrency" scale_image="true"
+             left="-210" mouse_opaque="true" name="buycurrency" scale_image="true"
              tool_tip="Buy currency" width="16" />
         <text type="string" length="12" bg_visible="false" border_drop_shadow_visible="false" 
                  border_visible="false"
              bottom="-20" disabled_color="1 1 1 1" drop_shadow_visible="true"
              enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
-             halign="right" height="18" hidden="false" left="-210" mouse_opaque="true"
+             halign="right" height="18" hidden="false" left="-300" mouse_opaque="true"
              name="TimeText" text_color="1 1 1 1" tool_tip="Current Time (Pacific)"
              v_pad="2" width="80">
                 12:00 AM
@@ -108,10 +108,49 @@
              image_unselected="status_buy_land.tga" label="" label_selected=""
              left="569" mouse_opaque="true" name="buyland" scale_image="true"
              tool_tip="Buy this parcel" width="16" />
-        <text hidden="true" name="packet_loss_tooltip">
-                Packet Loss
-        </text>
-        <text hidden="true" name="bandwidth_tooltip">
-                Bandwidth
-        </text>
+
+  <!-- When the user hits return we spawn the search directory,
+       which makes this lose focus.  We don't want to commit twice.
+       commit_on_focus_lost must be false. JC -->
+  <line_editor bevel_style="in"
+               border_style="line"
+               border_thickness="1"
+               bottom="-18"
+               enabled="true"
+               follows="right|bottom"
+               font="SansSerif"
+               handle_edit_keys_directly="false"
+               commit_on_focus_lost="false"
+               height="20"
+               hidden="false"
+               label="Search"
+               left="-125"
+               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"
+               width="104" />
+  <!-- *TODO: pressed state -->
+  <button bottom="-17"
+          enabled="true"
+          follows="right|bottom"
+          font="SansSerifSmall"
+          halign="center"
+          height="20"
+          hidden="false"
+          image_disabled="status_search.tga"
+          image_disabled_selected="status_search.tga"
+          image_selected="status_search.tga"
+          image_unselected="status_search.tga"
+          label=""
+          label_selected=""
+          left="-20"
+          mouse_opaque="true"
+          name="search_btn"
+          tool_tip="Search Second Life"
+          width="20" />
+          
 </panel>