#4411 UI adjustments

12 files changed, 429 insertions, 261 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 47cebe6472..aca9910253 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11211,6 +11211,28 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>FindLandArea</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables filtering of land search results by area</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>FindLandPrice</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables filtering of land search results by price</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>ShowNearClip</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llpaneldirbrowser.cpp b/indra/newview/llpaneldirbrowser.cpp
index 686a4866d5..ff431c6034 100644
--- a/indra/newview/llpaneldirbrowser.cpp
+++ b/indra/newview/llpaneldirbrowser.cpp
@@ -85,11 +85,14 @@ bool LLPanelDirBrowser::postBuild()
 {
     childSetCommitCallback("results", onCommitList, this);
 
-    childSetAction("< Prev", onClickPrev, this);
-    childSetVisible("< Prev", false);
+    mPrevPageBtn = getChild<LLButton>("prev_btn");
+    mNextPageBtn = getChild<LLButton>("next_btn");
 
-    childSetAction("Next >", onClickNext, this);
-    childSetVisible("Next >", false);
+    mPrevPageBtn->setClickedCallback([this](LLUICtrl*, const LLSD&){ prevPage(); });
+    mPrevPageBtn->setVisible(false);
+
+    mNextPageBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { nextPage(); });
+    mNextPageBtn->setVisible(false);
 
     return true;
 }
@@ -118,13 +121,13 @@ void LLPanelDirBrowser::draw()
                 if (list->getCanSelect())
                 {
                     list->selectFirstItem(); // select first item by default
-                    childSetFocus("results", TRUE);
+                    childSetFocus("results", true);
                 }
                 // Request specific data from the server
                 onCommitList(NULL, this);
             }
         }
-        mDidAutoSelect = TRUE;
+        mDidAutoSelect = true;
     }
 
     LLPanel::draw();
@@ -135,7 +138,7 @@ void LLPanelDirBrowser::draw()
 void LLPanelDirBrowser::nextPage()
 {
     mSearchStart += mResultsPerPage;
-    childSetVisible("< Prev", true);
+    mPrevPageBtn->setVisible(true);
 
     performQuery();
 }
@@ -145,7 +148,7 @@ void LLPanelDirBrowser::nextPage()
 void LLPanelDirBrowser::prevPage()
 {
     mSearchStart -= mResultsPerPage;
-    childSetVisible("< Prev", mSearchStart > 0);
+    mPrevPageBtn->setVisible(mSearchStart > 0);
 
     performQuery();
 }
@@ -154,8 +157,8 @@ void LLPanelDirBrowser::prevPage()
 void LLPanelDirBrowser::resetSearchStart()
 {
     mSearchStart = 0;
-    childSetVisible("Next >", false);
-    childSetVisible("< Prev", false);
+    mNextPageBtn->setVisible(false);
+    mPrevPageBtn->setVisible(false);
 }
 
 // protected
@@ -168,8 +171,7 @@ void LLPanelDirBrowser::updateResultCount()
 
     if (!mHaveSearchResults) result_count = 0;
 
-    LLView* viewp = getChild<LLView>("Next >");
-    if (viewp && viewp->getVisible()) 
+    if (mNextPageBtn && mNextPageBtn->getVisible()) 
     {
         // Item count be off by a few if bogus items sent from database
         // Just use the number of results per page. JC
@@ -198,21 +200,6 @@ void LLPanelDirBrowser::updateResultCount()
 }
 
 // static
-void LLPanelDirBrowser::onClickPrev(void* data)
-{
-    LLPanelDirBrowser* self = (LLPanelDirBrowser*)data;
-    self->prevPage();
-}
-
-
-// static
-void LLPanelDirBrowser::onClickNext(void* data)
-{
-    LLPanelDirBrowser* self = (LLPanelDirBrowser*)data;
-    self->nextPage();
-}
-
-// static
 std::string LLPanelDirBrowser::filterShortWords(const std::string source_string, int shortest_word_length, bool& was_filtered)
 {
     // degenerate case
@@ -253,7 +240,7 @@ void LLPanelDirBrowser::selectByUUID(const LLUUID& id)
 {
     LLCtrlListInterface *list = childGetListInterface("results");
     if (!list) return;
-    BOOL found = list->setCurrentByID(id);
+    bool found = list->setCurrentByID(id);
     if (found)
     {
         // we got it, don't wait for network
@@ -478,7 +465,7 @@ void LLPanelDirBrowser::processDirPeopleReply(LLMessageSystem *msg, void**)
 
     // Poke the result received timer
     self->mLastResultTimer.reset();
-    self->mDidAutoSelect = FALSE;
+    self->mDidAutoSelect = false;
 }
 
 
@@ -550,9 +537,9 @@ void LLPanelDirBrowser::processDirPlacesReply(LLMessageSystem* msg, void**)
         content["name"] = name;
 
         std::string buffer = llformat("%.0f", (F64)dwell);
-        row["columns"][3]["column"] = "dwell";
-        row["columns"][3]["value"] = buffer;
-        row["columns"][3]["font"] = "SansSerifSmall";
+        row["columns"][2]["column"] = "dwell";
+        row["columns"][2]["value"] = buffer;
+        row["columns"][2]["font"] = "SansSerifSmall";
 
         list->addElement(row);
         self->mResultsContents[parcel_id.asString()] = content;
@@ -563,7 +550,7 @@ void LLPanelDirBrowser::processDirPlacesReply(LLMessageSystem* msg, void**)
 
     // Poke the result received timer
     self->mLastResultTimer.reset();
-    self->mDidAutoSelect = FALSE;
+    self->mDidAutoSelect = false;
 }
 
 
@@ -707,7 +694,7 @@ void LLPanelDirBrowser::processDirEventsReply(LLMessageSystem* msg, void**)
 
     // Poke the result received timer
     self->mLastResultTimer.reset();
-    self->mDidAutoSelect = FALSE;
+    self->mDidAutoSelect = false;
 }
 
 
@@ -789,7 +776,7 @@ void LLPanelDirBrowser::processDirGroupsReply(LLMessageSystem* msg, void**)
 
     // Poke the result received timer
     self->mLastResultTimer.reset();
-    self->mDidAutoSelect = FALSE;
+    self->mDidAutoSelect = false;
 }
 
 
@@ -870,7 +857,7 @@ void LLPanelDirBrowser::processDirClassifiedReply(LLMessageSystem* msg, void**)
 
     // Poke the result received timer
     self->mLastResultTimer.reset();
-    self->mDidAutoSelect = FALSE;
+    self->mDidAutoSelect = false;
 }
 
 void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
@@ -910,10 +897,10 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
         self->mResultsContents = LLSD();
     }
 
-    BOOL use_price = gSavedSettings.getBOOL("FindLandPrice");
+    bool use_price = gSavedSettings.getBOOL("FindLandPrice");
     S32 limit_price = self->childGetValue("priceedit").asInteger();
 
-    BOOL use_area = gSavedSettings.getBOOL("FindLandArea");
+    bool use_area = gSavedSettings.getBOOL("FindLandArea");
     S32 limit_area = self->childGetValue("areaedit").asInteger();
 
     S32 i;
@@ -962,14 +949,14 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
             buffer = llformat("%d", sale_price);
             non_auction_count++;
         }
-        row["columns"][3]["column"] = "price";
-        row["columns"][3]["value"] = buffer;
-        row["columns"][3]["font"] = "SansSerifSmall";
+        row["columns"][2]["column"] = "price";
+        row["columns"][2]["value"] = buffer;
+        row["columns"][2]["font"] = "SansSerifSmall";
 
         buffer = llformat("%d", actual_area);
-        row["columns"][4]["column"] = "area";
-        row["columns"][4]["value"] = buffer;
-        row["columns"][4]["font"] = "SansSerifSmall";
+        row["columns"][3]["column"] = "area";
+        row["columns"][3]["value"] = buffer;
+        row["columns"][3]["font"] = "SansSerifSmall";
 
         if (!auction)
         {
@@ -984,21 +971,21 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
             }
             // Prices are usually L$1 - L$10 / meter
             buffer = llformat("%.1f", price_per_meter);
-            row["columns"][5]["column"] = "per_meter";
-            row["columns"][5]["value"] = buffer;
-            row["columns"][5]["font"] = "SansSerifSmall";
+            row["columns"][4]["column"] = "per_meter";
+            row["columns"][4]["value"] = buffer;
+            row["columns"][4]["font"] = "SansSerifSmall";
         }
         else
         {
             // Auctions start at L$1 per meter
-            row["columns"][5]["column"] = "per_meter";
-            row["columns"][5]["value"] = "1.0";
-            row["columns"][5]["font"] = "SansSerifSmall";
+            row["columns"][4]["column"] = "per_meter";
+            row["columns"][4]["value"] = "1.0";
+            row["columns"][4]["font"] = "SansSerifSmall";
         }
 
-        row["columns"][6]["column"] = "landtype";
-        row["columns"][6]["value"] = land_type;
-        row["columns"][6]["font"] = "SansSerifSmall";
+        row["columns"][5]["column"] = "landtype";
+        row["columns"][5]["value"] = land_type;
+        row["columns"][5]["font"] = "SansSerifSmall";
 
         list->addElement(row);
         self->mResultsContents[parcel_id.asString()] = content;
@@ -1013,7 +1000,7 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
 
     // Poke the result received timer
     self->mLastResultTimer.reset();
-    self->mDidAutoSelect = FALSE;
+    self->mDidAutoSelect = false;
 }
 
 void LLPanelDirBrowser::addClassified(LLCtrlListInterface *list, const LLUUID& pick_id, const std::string& name, const U32 creation_date, const S32 price_for_listing)
@@ -1038,7 +1025,7 @@ void LLPanelDirBrowser::addClassified(LLCtrlListInterface *list, const LLUUID& p
     list->addElement(row);
 }
 
-LLSD LLPanelDirBrowser::createLandSale(const LLUUID& parcel_id, BOOL is_auction, BOOL is_for_sale,  const std::string& name, S32 *type)
+LLSD LLPanelDirBrowser::createLandSale(const LLUUID& parcel_id, bool is_auction, bool is_for_sale,  const std::string& name, S32 *type)
 {
     LLSD row;
     row["id"] = parcel_id;
@@ -1070,9 +1057,9 @@ LLSD LLPanelDirBrowser::createLandSale(const LLUUID& parcel_id, BOOL is_auction,
         *type = PLACE_CODE;
     }
 
-    row["columns"][2]["column"] = "name";
-    row["columns"][2]["value"] = name;
-    row["columns"][2]["font"] = "SANSSERIF";
+    row["columns"][1]["column"] = "name";
+    row["columns"][1]["value"] = name;
+    row["columns"][1]["font"] = "SANSSERIF";
 
     return row;
 }
@@ -1089,8 +1076,8 @@ void LLPanelDirBrowser::setupNewSearch()
 
     // ready the list for results
     list->operateOnAll(LLCtrlListInterface::OP_DELETE);
-    list->setCommentText(std::string("Searching...")); // *TODO: Translate
-    childDisable("results");
+    list->setCommentText(LLTrans::getString("Searching"));
+    list->setEnabled(false);
 
     mResultsReceived = 0;
     mHaveSearchResults = FALSE;
@@ -1151,7 +1138,7 @@ void LLPanelDirBrowser::onKeystrokeName(LLLineEditor* line, void* data)
 }
 
 // setup results when shown
-void LLPanelDirBrowser::onVisibilityChange(BOOL new_visibility)
+void LLPanelDirBrowser::onVisibilityChange(bool new_visibility)
 {
     if (new_visibility)
     {
@@ -1168,7 +1155,7 @@ S32 LLPanelDirBrowser::showNextButton(S32 rows)
     {
         // HACK: The (mResultsPerPage)+1th entry indicates there are 'more'
         bool show_next = (mResultsReceived > mResultsPerPage);
-        childSetVisible("Next >", show_next);
+        mNextPageBtn->setVisible(show_next);
         if (show_next)
         {
             rows -= (mResultsReceived - mResultsPerPage);
@@ -1177,8 +1164,8 @@ S32 LLPanelDirBrowser::showNextButton(S32 rows)
     else
     {
         // Hide page buttons
-        childSetVisible("Next >", false);
-        childSetVisible("< Prev", false);
+        mNextPageBtn->setVisible(false);
+        mPrevPageBtn->setVisible(false);
     }
     return rows;
 }
diff --git a/indra/newview/llpaneldirbrowser.h b/indra/newview/llpaneldirbrowser.h
index 9891b7b0db..8954f397e7 100644
--- a/indra/newview/llpaneldirbrowser.h
+++ b/indra/newview/llpaneldirbrowser.h
@@ -47,7 +47,7 @@ public:
     // Use to get periodic updates.
     virtual void draw();
 
-    virtual void onVisibilityChange(BOOL curVisibilityIn);
+    virtual void onVisibilityChange(bool curVisibilityIn);
 
     // Redo your search for the prev/next page of results
     virtual void prevPage();
@@ -90,10 +90,6 @@ public:
 
     void showEvent(const U32 event_id);
 
-    // Prev/Next page buttons
-    static void onClickNext(void* data);
-    static void onClickPrev(void* data);
-
     static void onCommitList(LLUICtrl* ctrl, void* data);
 
     static void processDirPeopleReply(LLMessageSystem* msg, void**);
@@ -109,7 +105,7 @@ protected:
     void updateResultCount();
 
     void addClassified(LLCtrlListInterface *list, const LLUUID& classified_id, const std::string& name, const U32 creation_date, const S32 price_for_listing);
-    LLSD createLandSale(const LLUUID& parcel_id, BOOL is_auction, BOOL is_for_sale, const std::string& name, S32 *type);
+    LLSD createLandSale(const LLUUID& parcel_id, bool is_auction, bool is_for_sale, const std::string& name, S32 *type);
 
     static void onKeystrokeName(LLLineEditor* line, void* data);
 
@@ -139,6 +135,8 @@ protected:
     LLFrameTimer mLastResultTimer;
 
     LLFloaterDirectory* mFloaterDirectory;
+    LLButton* mPrevPageBtn;
+    LLButton* mNextPageBtn;
 };
 
 // Codes used for sorting by type.
diff --git a/indra/newview/llpaneldirgroups.cpp b/indra/newview/llpaneldirgroups.cpp
index 4809dffe6b..9a8f418a65 100644
--- a/indra/newview/llpaneldirgroups.cpp
+++ b/indra/newview/llpaneldirgroups.cpp
@@ -79,7 +79,7 @@ void LLPanelDirGroups::performQuery()
     }
 
     mCurrentSortColumn = "score";
-    mCurrentSortAscending = FALSE;
+    mCurrentSortAscending = false;
 
     // send the message
     sendDirFindQuery(
diff --git a/indra/newview/llpaneldirplaces.cpp b/indra/newview/llpaneldirplaces.cpp
index 4268decfe4..3f1fa2ab05 100644
--- a/indra/newview/llpaneldirplaces.cpp
+++ b/indra/newview/llpaneldirplaces.cpp
@@ -63,7 +63,7 @@ bool LLPanelDirPlaces::postBuild()
     //childDisable("Search");
 
     mCurrentSortColumn = "dwell";
-    mCurrentSortAscending = FALSE;
+    mCurrentSortAscending = false;
 
     return true;
 }
diff --git a/indra/newview/skins/default/xui/en/floater_directory.xml b/indra/newview/skins/default/xui/en/floater_directory.xml
index 9dd15bfed5..3274474337 100644
--- a/indra/newview/skins/default/xui/en/floater_directory.xml
+++ b/indra/newview/skins/default/xui/en/floater_directory.xml
@@ -2,7 +2,7 @@
 <floater
  can_close="true"
  can_drag_on_left="false"
- can_minimize="true"
+ single_instance="true"
  can_resize="true"
  height="570"
  min_height="570"
@@ -110,7 +110,7 @@
     <panel
      top="70"
      follows="bottom|right|top"
-     height="480"
+     height="482"
      left="345"
      visible="false"
      name="panel_group_info_sidetray"
@@ -120,7 +120,7 @@
     <panel
      top="70"
      follows="bottom|right|top"
-     height="480"
+     height="484"
      left="345"
      visible="false"
      name="panel_places"
@@ -130,7 +130,7 @@
     <panel
      top="70"
      follows="bottom|right|top"
-     height="480"
+     height="481"
      left="345"
      visible="false"
      name="panel_classified_info"
diff --git a/indra/newview/skins/default/xui/en/panel_dir_classified.xml b/indra/newview/skins/default/xui/en/panel_dir_classified.xml
index d56c8a8dfa..f4d3ccf748 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_classified.xml
@@ -35,7 +35,7 @@
     <combo_box
      allow_text_entry="false"
      top_delta="0"
-     left="465"
+     left="525"
      layout="topleft"
      follows="right|top"
      height="18"
@@ -55,46 +55,78 @@
         <combo_item name="Personal" value="9" label="Personal"/>
      </combo_box>
     <check_box
-     left_pad="20"
+     left_pad="5"
      control_name="ShowPGClassifieds"
      follows="right|top"
      layout="topleft"
      font="SansSerifSmall"
      height="16"
      initial_value="true"
-     label="PG"
+     label=""
      mouse_opaque="true"
      name="incpg"
-     width="35" />
+     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="5"
+     left_pad="4"
+     top_delta="1"
      layout="topleft"
      control_name="ShowMatureClassifieds"
      follows="right|top"
      font="SansSerifSmall"
      height="16"
      initial_value="true"
-     label="Mature"
+     label=""
      mouse_opaque="true"
      name="incmature"
-     width="56" />
+     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="5"
+     left_pad="4"
+     top_delta="1"
      layout="topleft"
      control_name="ShowAdultClassifieds"
      follows="right|top"
      font="SansSerifSmall"
      height="16"
      initial_value="false"
-     label="Adult"
+     label=""
      mouse_opaque="true"
      name="incadult"
-     width="50" />
+     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="2"
+     top_pad="3"
      follows="left|right|top"
      layout="topleft"
      font="SansSerif"
@@ -103,7 +135,7 @@
      max_length="63"
      mouse_opaque="true"
      name="name"
-     width="660" />
+     width="650" />
     <button
      follows="right|top"
      layout="topleft"
@@ -115,7 +147,7 @@
      left_pad="5"
      mouse_opaque="true"
      name="Search"
-     width="95" />
+     width="105" />
     <scroll_list
      background_visible="true"
      layout="topleft"
@@ -151,27 +183,33 @@
      v_pad="0"
      width="80" />
     <button
-     bottom="-533"
+     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"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="Next &gt;"
-     label_selected="Next &gt;"
-     mouse_opaque="true"
-     name="Next &gt;"
-     right="344"
-     width="80" />
+     height="22"
+     right="305"
+     bottom="-533"
+     name="prev_btn"
+     width="32" />
     <button
-     bottom_delta="0"
+     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"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="&lt; Prev"
-     label_selected="&lt; Prev"
-     mouse_opaque="true"
-     name="&lt; Prev"
-     right="258"
-     width="80" />
+     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
index 97636d25bb..ffbbbeb251 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_events.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_events.xml
@@ -34,7 +34,7 @@
     <combo_box
      allow_text_entry="false"
      top_delta="0"
-     left="465"
+     left="525"
      layout="topleft"
      follows="right|top"
      height="18"
@@ -57,46 +57,78 @@
         <combo_item name="Miscellaneous" value="29" label="Miscellaneous"/>
     </combo_box>
     <check_box
-     left_pad="20"
+     left_pad="5"
      control_name="ShowPGEvents"
      follows="right|top"
      layout="topleft"
      font="SansSerifSmall"
      height="16"
      initial_value="true"
-     label="PG"
+     label=""
      mouse_opaque="true"
      name="incpg"
-     width="35" />
+     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="5"
+     left_pad="4"
+     top_delta="1"
      layout="topleft"
      control_name="ShowMatureEvents"
      follows="right|top"
      font="SansSerifSmall"
      height="16"
      initial_value="true"
-     label="Mature"
+     label=""
      mouse_opaque="true"
      name="incmature"
-     width="56" />
+     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="5"
+     left_pad="4"
+     top_delta="1"
      layout="topleft"
      control_name="ShowAdultEvents"
      follows="right|top"
      font="SansSerifSmall"
      height="16"
      initial_value="false"
-     label="Adult"
+     label=""
      mouse_opaque="true"
      name="incadult"
-     width="50" />
+     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="2"
+     top_pad="3"
      follows="left|right|top"
      layout="topleft"
      font="SansSerif"
@@ -105,7 +137,7 @@
      max_length="63"
      mouse_opaque="true"
      name="event_search_text"
-     width="660" />
+     width="650" />
     <button
      follows="right|top"
      layout="topleft"
@@ -117,7 +149,7 @@
      left_pad="5"
      mouse_opaque="true"
      name="Search"
-     width="95" />
+     width="105" />
     <scroll_list
      background_visible="true"
      layout="topleft"
@@ -156,36 +188,42 @@
      v_pad="0"
      width="80" />
     <button
-     bottom="-533"
+     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"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="Next &gt;"
-     label_selected="Next &gt;"
-     mouse_opaque="true"
-     name="Next &gt;"
-     right="344"
-     width="80" />
+     height="22"
+     right="305"
+     bottom="-533"
+     name="prev_btn"
+     width="32" />
     <button
-     bottom_delta="0"
+     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"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="&lt; Prev"
-     label_selected="&lt; Prev"
-     mouse_opaque="true"
-     name="&lt; Prev"
-     right="258"
-     width="80" />
+     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="128"
+     left="160"
      mouse_opaque="true"
      name="date_mode"
      initial_value="current"
diff --git a/indra/newview/skins/default/xui/en/panel_dir_groups.xml b/indra/newview/skins/default/xui/en/panel_dir_groups.xml
index 10c90b2964..ed3f709005 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_groups.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_groups.xml
@@ -9,28 +9,35 @@
  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"
-     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" />
+     name="prev_btn"
+     width="32" />
     <button
-     bottom_delta="0"
-     follows="left|bottom"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="&lt; Prev"
-     right="258"
-     mouse_opaque="true"
-     name="&lt; Prev"
-     width="80" />
+     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"
@@ -51,13 +58,13 @@
     <check_box
      top_delta="0"
      control_name="ShowMatureGroups"
-     follows="left|top"
+     follows="right|top"
      layout="topleft"
      font="SansSerifSmall"
      height="16"
      initial_value="false"
      label="Include Mature groups"
-     left="465"
+     left="510"
      mouse_opaque="true"
      name="incmature"
      width="100" />
@@ -73,7 +80,7 @@
      max_length="63"
      mouse_opaque="true"
      name="name"
-     width="660" />
+     width="650" />
     <button
      follows="right|top"
      layout="topleft"
@@ -85,7 +92,7 @@
      left_pad="5"
      mouse_opaque="true"
      name="Search"
-     width="95" />
+     width="105" />
     <scroll_list
      background_visible="true"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_dir_land.xml b/indra/newview/skins/default/xui/en/panel_dir_land.xml
index 673b9493bb..61629f3033 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_land.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_land.xml
@@ -7,10 +7,6 @@
     <string name="not_found_text">
         None Found.
     </string>
-    <string name="land_help_text">
-        Land can be bought direct for Linden Dollars (L$) or at auction for either L$ or US$.
-        To buy direct, visit the land and click on the place name in the title bar.
-    </string>
     <text
      bg_visible="false"
      border_visible="false"
@@ -33,7 +29,7 @@
      layout="topleft"
      height="18"
      top_delta="0"
-     left="465"
+     left="525"
      max_chars="20"
      mouse_opaque="true"
      name="type"
@@ -44,43 +40,75 @@
         <combo_item name="EstateSales" value="Estate Sales" label="For Sale - Estate"/>
     </combo_box>
     <check_box
-     left_pad="20"
+     left_pad="5"
      control_name="ShowPGLand"
      follows="right|top"
      layout="topleft"
      font="SansSerifSmall"
      height="16"
      initial_value="true"
-     label="PG"
+     label=""
      mouse_opaque="true"
      name="incpg"
-     width="35" />
+     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="5"
+     left_pad="4"
+     top_delta="1"
      layout="topleft"
      control_name="ShowMatureLand"
      follows="right|top"
      font="SansSerifSmall"
      height="16"
      initial_value="true"
-     label="Mature"
+     label=""
      mouse_opaque="true"
      name="incmature"
-     width="56" />
+     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="5"
+     left_pad="4"
+     top_delta="1"
      layout="topleft"
      control_name="ShowAdultLand"
      follows="right|top"
      font="SansSerifSmall"
      height="16"
      initial_value="false"
-     label="Adult"
+     label=""
      mouse_opaque="true"
      name="incadult"
-     width="50" />
+     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="2"
+     top_pad="3"
      layout="topleft"
      control_name="FindLandPrice"
      follows="left|top"
@@ -166,10 +194,10 @@
      height="20"
      label="Search"
      top_delta="0"
-     left_pad="15"
+     left="660"
      mouse_opaque="true"
      name="Search"
-     width="95" />
+     width="105" />
     <scroll_list
      background_visible="true"
      layout="topleft"
@@ -186,7 +214,6 @@
      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="Type" name="landtype" width="50" />
         <column label="L$ Price" name="price" width="65" />
@@ -209,27 +236,33 @@
      v_pad="0"
      width="328" />
     <button
-     bottom="-533"
+     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"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="Next &gt;"
-     label_selected="Next &gt;"
-     mouse_opaque="true"
-     name="Next &gt;"
-     right="344"
-     width="80" />
+     height="22"
+     right="305"
+     bottom="-533"
+     name="prev_btn"
+     width="32" />
     <button
-     bottom_delta="0"
+     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"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="&lt; Prev"
-     label_selected="&lt; Prev"
-     mouse_opaque="true"
-     name="&lt; Prev"
-     right="258"
-     width="80" />
+     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
index 5b9fc68f33..fe1a7e9d94 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_people.xml
@@ -42,7 +42,7 @@
      max_length="63"
      mouse_opaque="true"
      name="name"
-     width="660" />
+     width="650" />
     <button
      follows="right|top"
      layout="topleft"
@@ -53,7 +53,7 @@
      label="Search"
      mouse_opaque="true"
      name="Search"
-     width="95" />
+     width="105" />
     <scroll_list
      background_visible="true"
      layout="topleft"
@@ -88,27 +88,33 @@
      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"
-     follows="left|bottom"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="Next &gt;"
-     label_selected="Next &gt;"
-     mouse_opaque="true"
-     name="Next &gt;"
-     right="330"
-     width="80" />
+     name="prev_btn"
+     width="32" />
     <button
-     bottom_delta="0"
-     follows="left|bottom"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="&lt; Prev"
-     label_selected="&lt; Prev"
-     mouse_opaque="true"
-     name="&lt; Prev"
-     right="244"
-     width="80" />
+     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
index 4640ef361e..d337f3addf 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_places.xml
@@ -36,7 +36,7 @@
      layout="topleft"
      height="18"
      top_delta="0"
-     left="465"
+     left="525"
      max_chars="20"
      mouse_opaque="true"
      name="Category"
@@ -56,46 +56,78 @@
         <combo_item name="Other" value="other" label="Other"/>
     </combo_box>
     <check_box
-     left_pad="20"
+     left_pad="5"
      control_name="ShowPGSims"
      follows="right|top"
      layout="topleft"
      font="SansSerifSmall"
      height="16"
      initial_value="true"
-     label="PG"
+     label=""
      mouse_opaque="true"
      name="incpg"
-     width="35" />
+     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="5"
+     left_pad="4"
+     top_delta="1"
      layout="topleft"
      control_name="ShowMatureSims"
      follows="right|top"
      font="SansSerifSmall"
      height="16"
      initial_value="true"
-     label="Mature"
+     label=""
      mouse_opaque="true"
      name="incmature"
-     width="56" />
+     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="5"
+     left_pad="4"
+     top_delta="1"
      layout="topleft"
      control_name="ShowAdultSims"
      follows="right|top"
      font="SansSerifSmall"
      height="16"
      initial_value="false"
-     label="Adult"
+     label=""
      mouse_opaque="true"
      name="incadult"
-     width="50" />
+     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="2"
+     top_pad="3"
      follows="left|right|top"
      layout="topleft"
      font="SansSerif"
@@ -104,7 +136,7 @@
      max_length="63"
      mouse_opaque="true"
      name="name"
-     width="660" />
+     width="650" />
     <button
      follows="right|top"
      layout="topleft"
@@ -116,7 +148,7 @@
      left_pad="5"
      mouse_opaque="true"
      name="Search"
-     width="95" />
+     width="105" />
     <scroll_list
      background_visible="true"
      layout="topleft"
@@ -133,7 +165,6 @@
      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="Traffic" name="dwell" width="75" />
     </scroll_list>
@@ -152,25 +183,33 @@
      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"
-     follows="left|bottom"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="Next &gt;"
-     mouse_opaque="true"
-     name="Next &gt;"
-     right="344"
-     width="80" />
+     name="prev_btn"
+     width="32" />
     <button
-     bottom_delta="0"
-     follows="left|bottom"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="&lt; Prev"
-     mouse_opaque="true"
-     name="&lt; Prev"
-     right="258"
-     width="80" />
+     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>