18 files changed, 172 insertions, 346 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 98bf49b55a..47cebe6472 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11107,6 +11107,45 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>ShowPGClassifieds</key>
+    <map>
+      <key>Comment</key>
+      <string>Display results of find classifieds that are flagged as general</string>
+      <key>Persist</key>
+      <integer>1</integer>
+	  <key>HideFromEditor</key>
+	  <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>ShowMatureClassifieds</key>
+    <map>
+      <key>Comment</key>
+      <string>Display results of find classifieds that are flagged as moderate</string>
+      <key>Persist</key>
+      <integer>1</integer>
+	  <key>HideFromEditor</key>
+	  <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>ShowAdultClassifieds</key>
+    <map>
+      <key>Comment</key>
+      <string>Display results of find classifieds that are flagged as adult</string>
+      <key>Persist</key>
+      <integer>1</integer>
+	  <key>HideFromEditor</key>
+	  <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>ShowPGSims</key>
     <map>
       <key>Comment</key>
@@ -11159,6 +11198,19 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>ShowMatureGroups</key>
+    <map>
+      <key>Comment</key>
+      <string>Include groups that are flagged as mature to Search results</string>
+      <key>Persist</key>
+      <integer>1</integer>
+	  <key>HideFromEditor</key>
+	  <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>ShowNearClip</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llpaneldirbrowser.cpp b/indra/newview/llpaneldirbrowser.cpp
index 2391ced6ed..686a4866d5 100644
--- a/indra/newview/llpaneldirbrowser.cpp
+++ b/indra/newview/llpaneldirbrowser.cpp
@@ -249,52 +249,6 @@ std::string LLPanelDirBrowser::filterShortWords(const std::string source_string,
     return dest_string.str();
 }
 
-void LLPanelDirBrowser::updateMaturityCheckbox()
-{
-    BOOL godlike = gAgent.isGodlike();
-    // You only have a choice if your maturity is 'mature' or higher.
-    // Logic: if you're not at least mature, hide the mature and adult options
-    // After that, enable only the options you can legitimately choose.
-    // If you're PG only, show you the checkbox but don't let you change it.
-    // If you're God, you have everything.
-    bool mature_enabled = gAgent.canAccessMature() || godlike;
-    bool adult_enabled = gAgent.canAccessAdult() || godlike;
-
-    // TODO: fix maturity settings
-    // These check boxes can only be checked if you have the right access to use them
-    //std::string control_name_pg = getChild<LLCheckBoxCtrl>("incpg")->getControlName();
-    //std::string control_name_mature = getChild<LLCheckBoxCtrl>("incmature")->getControlName();
-    //std::string control_name_adult = getChild<LLCheckBoxCtrl>("incadult")->getControlName();
-
-    //childSetValue("incpg", gSavedSettings.getBOOL(control_name_pg));
-    //childSetValue("incmature", gSavedSettings.getBOOL(control_name_mature) && mature_enabled);
-    //childSetValue("incadult", gSavedSettings.getBOOL(control_name_adult) && adult_enabled);
-
-    childSetValue("incpg", true);
-    childSetValue("incmature", true);
-    childSetValue("incadult", true);
-
-    // Teens don't get mature/adult choices
-    if (gAgent.wantsPGOnly())
-    {
-        childSetVisible("incmature", false);
-        childSetVisible("incadult", false);
-        childSetValue("incpg", TRUE);
-        childDisable("incpg");
-    }
-
-    childSetEnabled("incmature", mature_enabled);		
-    childSetEnabled("incadult", adult_enabled);
-
-    if (mature_enabled)
-    {
-        childEnable("incpg");
-        childSetVisible("incpg", TRUE);
-        childSetVisible("incmature", TRUE);
-        childSetVisible("incadult", TRUE);
-    }
-}
-
 void LLPanelDirBrowser::selectByUUID(const LLUUID& id)
 {
     LLCtrlListInterface *list = childGetListInterface("results");
@@ -598,7 +552,7 @@ void LLPanelDirBrowser::processDirPlacesReply(LLMessageSystem* msg, void**)
         std::string buffer = llformat("%.0f", (F64)dwell);
         row["columns"][3]["column"] = "dwell";
         row["columns"][3]["value"] = buffer;
-        row["columns"][3]["font"] = "SANSSERIFSMALL";
+        row["columns"][3]["font"] = "SansSerifSmall";
 
         list->addElement(row);
         self->mResultsContents[parcel_id.asString()] = content;
@@ -736,11 +690,11 @@ void LLPanelDirBrowser::processDirEventsReply(LLMessageSystem* msg, void**)
 
         row["columns"][2]["column"] = "date";
         row["columns"][2]["value"] = date;
-        row["columns"][2]["font"] = "SANSSERIFSMALL";
+        row["columns"][2]["font"] = "SansSerifSmall";
 
         row["columns"][3]["column"] = "time";
         row["columns"][3]["value"] = llformat("%u", unix_time);
-        row["columns"][3]["font"] = "SANSSERIFSMALL";
+        row["columns"][3]["font"] = "SansSerifSmall";
 
         list->addElement(row, ADD_TOP /*ADD_SORTED*/);
 
@@ -822,7 +776,7 @@ void LLPanelDirBrowser::processDirGroupsReply(LLMessageSystem* msg, void**)
 
         row["columns"][2]["column"] = "members";
         row["columns"][2]["value"] = members;
-        row["columns"][2]["font"] = "SANSSERIFSMALL";
+        row["columns"][2]["font"] = "SansSerifSmall";
 
         row["columns"][3]["column"] = "score";
         row["columns"][3]["value"] = search_order;
@@ -979,7 +933,6 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
         if ( msg->getSizeFast(_PREHASH_QueryReplies, i, _PREHASH_ProductSKU) > 0 )
         {
             msg->getStringFast(_PREHASH_QueryReplies, _PREHASH_ProductSKU, land_sku, i);
-            LL_INFOS() << "Land sku: " << land_sku << LL_ENDL;
             land_type = LLProductInfoRequestManager::instance().getDescriptionForSku(land_sku);
         }
         else
@@ -1011,12 +964,12 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
         }
         row["columns"][3]["column"] = "price";
         row["columns"][3]["value"] = buffer;
-        row["columns"][3]["font"] = "SANSSERIFSMALL";
+        row["columns"][3]["font"] = "SansSerifSmall";
 
         buffer = llformat("%d", actual_area);
         row["columns"][4]["column"] = "area";
         row["columns"][4]["value"] = buffer;
-        row["columns"][4]["font"] = "SANSSERIFSMALL";
+        row["columns"][4]["font"] = "SansSerifSmall";
 
         if (!auction)
         {
@@ -1033,19 +986,19 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
             buffer = llformat("%.1f", price_per_meter);
             row["columns"][5]["column"] = "per_meter";
             row["columns"][5]["value"] = buffer;
-            row["columns"][5]["font"] = "SANSSERIFSMALL";
+            row["columns"][5]["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"][5]["font"] = "SansSerifSmall";
         }
 
         row["columns"][6]["column"] = "landtype";
         row["columns"][6]["value"] = land_type;
-        row["columns"][6]["font"] = "SANSSERIFSMALL";
+        row["columns"][6]["font"] = "SansSerifSmall";
 
         list->addElement(row);
         self->mResultsContents[parcel_id.asString()] = content;
@@ -1080,7 +1033,7 @@ void LLPanelDirBrowser::addClassified(LLCtrlListInterface *list, const LLUUID& p
 
     row["columns"][2]["column"] = "price";
     row["columns"][2]["value"] = price_for_listing;
-    row["columns"][2]["font"] = "SANSSERIFSMALL";
+    row["columns"][2]["font"] = "SansSerifSmall";
 
     list->addElement(row);
 }
diff --git a/indra/newview/llpaneldirbrowser.h b/indra/newview/llpaneldirbrowser.h
index e3bc94c2c8..9891b7b0db 100644
--- a/indra/newview/llpaneldirbrowser.h
+++ b/indra/newview/llpaneldirbrowser.h
@@ -105,9 +105,6 @@ public:
 
     std::string filterShortWords( const std::string source_string, int shortest_word_length, bool& was_filtered );
 
-    // Logic to control maturity checkboxes in Classified/Events/Places/'Land for Sale' tabs.
-    void updateMaturityCheckbox();
-
 protected:
     void updateResultCount();
 
diff --git a/indra/newview/llpaneldirclassified.cpp b/indra/newview/llpaneldirclassified.cpp
index 9ce6b88b25..cedd91e1bd 100644
--- a/indra/newview/llpaneldirclassified.cpp
+++ b/indra/newview/llpaneldirclassified.cpp
@@ -61,33 +61,7 @@ bool LLPanelDirClassified::postBuild()
 {
     LLPanelDirBrowser::postBuild();
 
-    // Teens don't get mature checkbox
-    if (gAgent.wantsPGOnly())
-    {
-        childSetValue("incmature", FALSE);
-        childSetValue("incadult", FALSE);
-        childSetVisible("incmature", false);
-        childSetVisible("incadult", false);
-        childSetValue("incpg", TRUE);
-        childDisable("incpg");
-    }
-
-    bool mature_enabled = gAgent.canAccessMature();
-    if (!mature_enabled)
-    {
-        childSetValue("incmature", FALSE);
-        childDisable("incmature");
-    }
-
-    bool adult_enabled = gAgent.canAccessAdult();
-    if (!adult_enabled)
-    {
-        childSetValue("incadult", FALSE);
-        childDisable("incadult");
-    }
-
     childSetAction("Search", onClickSearchCore, this);
-
     return true;
 }
 
@@ -95,23 +69,12 @@ LLPanelDirClassified::~LLPanelDirClassified()
 {
 }
 
-void LLPanelDirClassified::draw()
-{
-    refresh();
-
-    LLPanelDirBrowser::draw();
-}
-
-void LLPanelDirClassified::refresh()
-{
-    updateMaturityCheckbox();
-}
-
 void LLPanelDirClassified::performQuery()
 {
-    BOOL inc_pg = childGetValue("incpg").asBoolean();
-    BOOL inc_mature = childGetValue("incmature").asBoolean();
-    BOOL inc_adult = childGetValue("incadult").asBoolean();
+    static LLUICachedControl<bool> inc_pg("ShowPGClassifieds", true);
+    static LLUICachedControl<bool> inc_mature("ShowMatureClassifieds", false);
+    static LLUICachedControl<bool> inc_adult("ShowAdultClassifieds", false);
+
     if (!(inc_pg || inc_mature || inc_adult))
     {
         LLNotificationsUtil::add("NoContentToSearch");
@@ -129,9 +92,9 @@ void LLPanelDirClassified::performQuery()
     msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
 
     bool filter_auto_renew = false;
-    U32 query_flags = pack_classified_flags_request(filter_auto_renew, inc_pg, inc_mature, inc_adult);
-    //if (gAgent.isTeen()) query_flags |= DFQ_PG_SIMS_ONLY;
-
+    U32 query_flags = pack_classified_flags_request(filter_auto_renew, inc_pg,
+                                                                       inc_mature && gAgent.canAccessMature(),
+                                                                       inc_adult && gAgent.canAccessAdult());
     U32 category = childGetValue("Category").asInteger();
 	
     msg->nextBlockFast(_PREHASH_QueryData);
diff --git a/indra/newview/llpaneldirclassified.h b/indra/newview/llpaneldirclassified.h
index 76c3d8635a..6682f73929 100644
--- a/indra/newview/llpaneldirclassified.h
+++ b/indra/newview/llpaneldirclassified.h
@@ -42,12 +42,8 @@ public:
     LLPanelDirClassified();
     /*virtual*/ ~LLPanelDirClassified();
 
-    /*virtual*/ void draw();
-
     bool postBuild();
 
-    void refresh();
-
     // Request the classifieds from the database
     void performQuery();
 
diff --git a/indra/newview/llpaneldirevents.cpp b/indra/newview/llpaneldirevents.cpp
index 07a76e050b..868ccc4c33 100644
--- a/indra/newview/llpaneldirevents.cpp
+++ b/indra/newview/llpaneldirevents.cpp
@@ -47,7 +47,6 @@ static LLPanelInjector<LLPanelDirEvents> t_panel_dir_events("panel_dir_events");
 
 LLPanelDirEvents::LLPanelDirEvents()
     : LLPanelDirBrowser(),
-    mDoneQuery(FALSE),
     mDay(0)
 {
     // more results per page for this
@@ -63,8 +62,6 @@ bool LLPanelDirEvents::postBuild()
     childSetAction("<<", onBackBtn, this);
     childSetAction(">>", onForwardBtn, this);
 
-    childSetAction("Today", onClickToday, this);
-
     childSetCommitCallback("mature", onCommitMature, this);
 
     childSetAction("Search", LLPanelDirBrowser::onClickSearchCore, this);
@@ -83,20 +80,6 @@ LLPanelDirEvents::~LLPanelDirEvents()
 {
 }
 
-
-void LLPanelDirEvents::draw()
-{
-    refresh();
-
-    LLPanelDirBrowser::draw();
-}
-
-void LLPanelDirEvents::refresh()
-{
-    updateMaturityCheckbox();
-}
-
-
 void LLPanelDirEvents::setDay(S32 day)
 {
     mDay = day;
@@ -155,19 +138,14 @@ void LLPanelDirEvents::performQueryOrDelete(U32 event_id)
     // offset from this day.
     mDay = relative_day;
 
-    mDoneQuery = TRUE;
+    static LLUICachedControl<bool> incpg("ShowPGEvents", true);
+    static LLUICachedControl<bool> incmature("ShowMatureEvents", false);
+    static LLUICachedControl<bool> incadult("ShowAdultEvents", false);
 
     U32 scope = DFQ_DATE_EVENTS;
-    if ( gAgent.wantsPGOnly()) scope |= DFQ_PG_SIMS_ONLY;
-    if ( childGetValue("incpg").asBoolean() ) scope |= DFQ_INC_PG;
-    if ( childGetValue("incmature").asBoolean() ) scope |= DFQ_INC_MATURE;
-    if ( childGetValue("incadult").asBoolean() ) scope |= DFQ_INC_ADULT;
-
-    // Add old query flags in case we are talking to an old server
-    if ( childGetValue("incpg").asBoolean() && !childGetValue("incmature").asBoolean())
-    {
-        scope |= DFQ_PG_EVENTS_ONLY;
-    }
+    if (incpg) scope |= DFQ_INC_PG;
+    if (incmature && gAgent.canAccessMature()) scope |= DFQ_INC_MATURE;
+    if (incadult && gAgent.canAccessAdult()) scope |= DFQ_INC_ADULT;
 
     if ( !( scope & (DFQ_INC_PG | DFQ_INC_MATURE | DFQ_INC_ADULT )))
     {
@@ -191,7 +169,7 @@ void LLPanelDirEvents::performQueryOrDelete(U32 event_id)
 
     // Categories are stored in the database in table indra.event_category
     // XML must match.
-    U32 cat_id = childGetValue("category combo").asInteger();
+    U32 cat_id = childGetValue("category_combo").asInteger();
 
     params << cat_id << "|";
     params << childGetValue("event_search_text").asString();
@@ -230,29 +208,17 @@ void LLPanelDirEvents::onDateModeCallback(LLUICtrl* ctrl, void *data)
     LLPanelDirEvents* self = (LLPanelDirEvents*)data;
     if (self->childGetValue("date_mode").asString() == "date")
     {
-        self->childEnable("Today");
         self->childEnable(">>");
         self->childEnable("<<");
     }
     else
     {
-        self->childDisable("Today");
         self->childDisable(">>");
         self->childDisable("<<");
     }
 }
 
 // static
-void LLPanelDirEvents::onClickToday(void *userdata)
-{
-    LLPanelDirEvents *self = (LLPanelDirEvents *)userdata;
-    self->resetSearchStart();
-    self->setDay(0);
-    self->performQuery();
-}
-
-
-// static
 void LLPanelDirEvents::onBackBtn(void* data)
 {
     LLPanelDirEvents* self = (LLPanelDirEvents*)data;
diff --git a/indra/newview/llpaneldirevents.h b/indra/newview/llpaneldirevents.h
index 0383edbe6c..6a86826749 100644
--- a/indra/newview/llpaneldirevents.h
+++ b/indra/newview/llpaneldirevents.h
@@ -38,16 +38,12 @@ public:
     LLPanelDirEvents();
     virtual ~LLPanelDirEvents();
 
-    /*virtual*/ void draw();
-
-    bool postBuild();
+    bool postBuild() override;
 
     /*virtual*/ void performQuery();
 
     void performQueryOrDelete(U32 event_id);
 
-    void refresh();
-
     // pass 0 for today, 1 for tomorrow
     void setDay(S32 day);
 
@@ -55,12 +51,9 @@ protected:
     static void onDateModeCallback(LLUICtrl* ctrl, void *data);
     static void onBackBtn(void* data);
     static void onForwardBtn(void* data);
-    static void onClickToday(void *userdata);
     static void onCommitMature(LLUICtrl* ctrl, void* data);
-    static void onClickSearch(void *data);
 
 protected:
-    bool mDoneQuery;
     S32 mDay; // 0 = today, 1 = tomorrow
 };
 
diff --git a/indra/newview/llpaneldirgroups.cpp b/indra/newview/llpaneldirgroups.cpp
index 63ae0f59ab..4809dffe6b 100644
--- a/indra/newview/llpaneldirgroups.cpp
+++ b/indra/newview/llpaneldirgroups.cpp
@@ -32,7 +32,6 @@
 #include "llqueryflags.h"
 #include "llviewercontrol.h"
 #include "llsearcheditor.h"
-#include "message.h"
 
 static LLPanelInjector<LLPanelDirGroups> t_panel_dir_groups("panel_dir_groups");
 
@@ -58,7 +57,6 @@ bool LLPanelDirGroups::postBuild()
 
 LLPanelDirGroups::~LLPanelDirGroups()
 {
-    // Children all cleaned up by default view destructor.
 }
 
 // virtual
diff --git a/indra/newview/llpaneldirland.cpp b/indra/newview/llpaneldirland.cpp
index cce0e4656c..ae1dfae092 100644
--- a/indra/newview/llpaneldirland.cpp
+++ b/indra/newview/llpaneldirland.cpp
@@ -34,21 +34,14 @@
 
 #include "llpaneldirland.h"
 
-// linden library includes
-#include "llfontgl.h"
-#include "llparcel.h"
-#include "llqueryflags.h"
-#include "message.h"
-
-// viewer project includes
 #include "llagent.h"
 #include "llcheckboxctrl.h"
 #include "llcombobox.h"
 #include "lllineeditor.h"
 #include "llnotificationsutil.h"
+#include "llqueryflags.h"
 #include "llscrolllistctrl.h"
 #include "llstatusbar.h"
-#include "lluiconstants.h"
 #include "lltextbox.h"
 #include "llviewercontrol.h"
 #include "llviewermessage.h"
@@ -124,14 +117,6 @@ LLPanelDirLand::~LLPanelDirLand()
     // Children all cleaned up by default view destructor.
 }
 
-// virtual
-void LLPanelDirLand::draw()
-{
-    updateMaturityCheckbox();
-
-    LLPanelDirBrowser::draw();
-}
-
 void LLPanelDirLand::onClickSort()
 {
     performQuery();
@@ -159,9 +144,9 @@ void LLPanelDirLand::onCommitArea(LLUICtrl* ctrl, void* data)
 
 void LLPanelDirLand::performQuery()
 {
-    BOOL inc_pg = childGetValue("incpg").asBoolean();
-    BOOL inc_mature = childGetValue("incmature").asBoolean();
-    BOOL inc_adult = childGetValue("incadult").asBoolean();
+    static LLUICachedControl<bool> inc_pg("ShowPGLand", true);
+    static LLUICachedControl<bool> inc_mature("ShowMatureLand", false);
+    static LLUICachedControl<bool> inc_adult("ShowAdultLand", false);
     if (!(inc_pg || inc_mature || inc_adult))
     {
         LLNotificationsUtil::add("NoContentToSearch");
diff --git a/indra/newview/llpaneldirland.h b/indra/newview/llpaneldirland.h
index 50fc633f23..1d3168f19f 100644
--- a/indra/newview/llpaneldirland.h
+++ b/indra/newview/llpaneldirland.h
@@ -44,8 +44,6 @@ public:
     LLPanelDirLand();
     /*virtual*/ ~LLPanelDirLand();
 
-    /*virtual*/ void draw();
-
     bool postBuild();
 
     void performQuery();
diff --git a/indra/newview/llpaneldirplaces.cpp b/indra/newview/llpaneldirplaces.cpp
index 631057b101..4268decfe4 100644
--- a/indra/newview/llpaneldirplaces.cpp
+++ b/indra/newview/llpaneldirplaces.cpp
@@ -40,7 +40,6 @@
 #include "llfloaterdirectory.h"
 #include "lllineeditor.h"
 #include "llnotificationsutil.h"
-#include "llviewerwindow.h"
 #include "llpaneldirbrowser.h"
 #include "llsearcheditor.h"
 #include "lltextbox.h"
@@ -66,9 +65,6 @@ bool LLPanelDirPlaces::postBuild()
     mCurrentSortColumn = "dwell";
     mCurrentSortAscending = FALSE;
 
-    childSetVisible("Category", true);
-    childSetEnabled("Category", true);
-
     return true;
 }
 
@@ -77,14 +73,6 @@ LLPanelDirPlaces::~LLPanelDirPlaces()
 }
 
 // virtual
-void LLPanelDirPlaces::draw()
-{
-    updateMaturityCheckbox();
-
-    LLPanelDirBrowser::draw();
-}
-
-// virtual
 void LLPanelDirPlaces::performQuery()
 {
     std::string place_name = childGetValue("name").asString();
@@ -130,27 +118,25 @@ void LLPanelDirPlaces::performQuery()
     bool adult_enabled = gAgent.canAccessAdult();
     bool mature_enabled = gAgent.canAccessMature();
 
-    if( gSavedSettings.getBOOL("ShowPGSims"))
+    static LLUICachedControl<bool> inc_pg("ShowPGSims", true);
+    static LLUICachedControl<bool> inc_mature("ShowMatureSims", false);
+    static LLUICachedControl<bool> inc_adult("ShowAdultSims", false);
+
+    if (inc_pg)
     {
         flags |= DFQ_INC_PG;
     }
 
-    if( gSavedSettings.getBOOL("ShowMatureSims") && mature_enabled)
+    if (inc_mature && mature_enabled)
     {
         flags |= DFQ_INC_MATURE;
     }
 
-    if( gSavedSettings.getBOOL("ShowAdultSims") && adult_enabled)
+    if (inc_adult && adult_enabled)
     {
         flags |= DFQ_INC_ADULT;
     }
 
-    // Pack old query flag in case we are talking to an old server
-    if ( ((flags & DFQ_INC_PG) == DFQ_INC_PG) && !((flags & DFQ_INC_MATURE) == DFQ_INC_MATURE) )
-    {
-        flags |= DFQ_PG_PARCELS_ONLY;
-    }
- 
     if (0x0 == flags)
     {
         LLNotificationsUtil::add("NoContentToSearch");
diff --git a/indra/newview/llpaneldirplaces.h b/indra/newview/llpaneldirplaces.h
index 9dea576e87..5d91d75810 100644
--- a/indra/newview/llpaneldirplaces.h
+++ b/indra/newview/llpaneldirplaces.h
@@ -37,11 +37,7 @@ public:
     LLPanelDirPlaces();
     virtual ~LLPanelDirPlaces();
 
-    /*virtual*/ void draw();
-
-    bool postBuild();
-
-    static void onClickSearch(void *userdata);
+    bool postBuild() override;
 
     void performQuery();
 
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index afd3f9410b..b05904cd28 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -344,7 +344,6 @@
           width="290"
           height="215">
         <text
-         auto_resize="false"
          follows="left|top"
          font.style="BOLD"
          height="10"
diff --git a/indra/newview/skins/default/xui/en/panel_dir_classified.xml b/indra/newview/skins/default/xui/en/panel_dir_classified.xml
index 8478a513ee..d56c8a8dfa 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_classified.xml
@@ -43,37 +43,17 @@
      mouse_opaque="true"
      name="Category"
      width="128">
-        <combo_item name="AnyCategory" value="0">
-            Any Category
-        </combo_item>
-        <combo_item name="Shopping" value="1">
-            Shopping
-        </combo_item>
-        <combo_item name="LandRental" value="2">
-            Land Rental
-        </combo_item>
-        <combo_item name="PropertyRental" value="3">
-            Property Rental
-        </combo_item>
-        <combo_item name="SpecialAttraction" value="4">
-            Special Attraction
-        </combo_item>
-        <combo_item name="NewProducts" value="5">
-            New Products
-        </combo_item>
-        <combo_item name="Employment" value="6">
-            Employment
-        </combo_item>
-        <combo_item name="Wanted" value="7">
-            Wanted
-        </combo_item>
-        <combo_item name="Service" value="8">
-            Service
-        </combo_item>
-        <combo_item name="Personal" value="9">
-            Personal
-        </combo_item>
-    </combo_box>
+        <combo_item name="AnyCategory" value="0" label="Any Category"/>
+        <combo_item name="Shopping" value="1" label="Shopping"/>
+        <combo_item name="LandRental" value="2" label="Land Rental"/>
+        <combo_item name="PropertyRental" value="3" label="Property Rental"/>
+        <combo_item name="SpecialAttraction" value="4" label="Special Attraction"/>
+        <combo_item name="NewProducts" value="5" label="New Products"/>
+        <combo_item name="Employment" value="6" label="Employment"/>
+        <combo_item name="Wanted" value="7" label="Wanted"/>
+        <combo_item name="Service" value="8" label="Service"/>
+        <combo_item name="Personal" value="9" label="Personal"/>
+     </combo_box>
     <check_box
      left_pad="20"
      control_name="ShowPGClassifieds"
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 6f21cc06c5..97636d25bb 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_events.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_events.xml
@@ -40,44 +40,21 @@
      height="18"
      max_chars="20"
      mouse_opaque="true"
-     name="category combo"
+     name="category_combo"
      width="128">
-        <combo_item name="All" value="0">
-            Any Category
-        </combo_item>
-        <combo_item name="Discussion" value="18">
-            Discussion
-        </combo_item>
-        <combo_item name="Sports" value="19">
-            Sports
-        </combo_item>
-        <combo_item name="LiveMusic" value="20">
-            Live Music
-        </combo_item>
-        <combo_item name="Commercial" value="22">
-            Commercial
-        </combo_item>
-        <combo_item name="Nightlife/Entertainment" value="23">
-            Nightlife/Entertainment
-        </combo_item>
-        <combo_item name="Games/Contests" value="24">
-            Games/Contests
-        </combo_item>
-        <combo_item name="Pageants" value="25">
-            Pageants
-        </combo_item>
-        <combo_item name="Education" value="26">
-            Education
-        </combo_item>
-        <combo_item name="ArtsandCulture" value="27">
-            Arts and Culture
-        </combo_item>
-        <combo_item name="Charity/SupportGroups" value="28">
-            Charity/Support Groups
-        </combo_item>
-        <combo_item name="Miscellaneous" value="29">
-            Miscellaneous
-        </combo_item>
+        <combo_item name="All" value="0" label="Any Category"/>
+        <combo_item name="Discussion" value="18" label="Discussion"/>
+        <combo_item name="Sports" value="19" label="Sports"/>
+        <combo_item name="LiveMusic" value="20" label="Live Music"/>
+        <combo_item name="LiveDJ" value="30" label="Live DJ"/>
+        <combo_item name="Commercial" value="22" label="Commercial"/>
+        <combo_item name="Nightlife/Entertainment" value="23" label="Nightlife/Entertainment"/>
+        <combo_item name="Games/Contests" value="24" label="Games/Contests"/>
+        <combo_item name="Pageants" value="25" label="Pageants"/>
+        <combo_item name="Education" value="26" label="Education"/>
+        <combo_item name="ArtsandCulture" value="27" label="Arts and Culture"/>
+        <combo_item name="Charity/SupportGroups" value="28" label="Charity/Support Groups"/>
+        <combo_item name="Miscellaneous" value="29" label="Miscellaneous"/>
     </combo_box>
     <check_box
      left_pad="20"
@@ -165,7 +142,6 @@
     </scroll_list>
     <text
      bg_visible="false"
-     border_drop_shadow_visible="false"
      border_visible="false"
      bottom_delta="-20"
      drop_shadow_visible="true"
@@ -212,6 +188,7 @@
      left="128"
      mouse_opaque="true"
      name="date_mode"
+     initial_value="current"
      width="200">
         <radio_item
          layout="topleft"
@@ -252,7 +229,6 @@
     <text
      top="8"
      bg_visible="false"
-     border_drop_shadow_visible="false"
      border_visible="false"
      left_pad="1"
      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 d82ce7f767..673b9493bb 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_land.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_land.xml
@@ -38,18 +38,10 @@
      mouse_opaque="true"
      name="type"
      width="128">
-        <combo_item name="AllTypes" value="All Types">
-            All Types
-        </combo_item>
-        <combo_item name="Auction" value="Auction">
-            Auction
-        </combo_item>
-        <combo_item name="MainlandSales" value="Mainland Sales">
-            For Sale - Mainland
-        </combo_item>
-        <combo_item name="EstateSales" value="Estate Sales">
-            For Sale - Estate
-        </combo_item>
+        <combo_item name="AllTypes" value="All Types" label="All Types"/>
+        <combo_item name="Auction" value="Auction" label="Auction"/>
+        <combo_item name="MainlandSales" value="Mainland Sales" label="For Sale - Mainland"/>
+        <combo_item name="EstateSales" value="Estate Sales" label="For Sale - Estate"/>
     </combo_box>
     <check_box
      left_pad="20"
@@ -115,7 +107,6 @@
      width="50" />
     <text
      bg_visible="false"
-     border_drop_shadow_visible="false"
      border_visible="false"
      follows="left|top"
      layout="topleft"
@@ -155,7 +146,6 @@
      width="50" />
     <text
      bg_visible="false"
-     border_drop_shadow_visible="false"
      border_visible="false"
      follows="left|top"
      layout="topleft"
@@ -203,14 +193,43 @@
         <column label="Area" name="area" width="50" />
         <column label="L$/m²" name="per_meter" width="65" />
     </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" />
-    <button bottom="-533" 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" />
-    <button bottom_delta="0" 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" />
+    <text
+     bg_visible="false"
+     border_visible="false"
+     bottom_delta="-20"
+     drop_shadow_visible="true"
+     follows="left|bottom"
+     font="SansSerifSmall"
+     h_pad="0"
+     halign="left"
+     height="16"
+     left="4"
+     mouse_opaque="true"
+     name="result_text"
+     v_pad="0"
+     width="328" />
+    <button
+     bottom="-533"
+     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" />
+    <button
+     bottom_delta="0"
+     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" />
 </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 a28a53c12c..4640ef361e 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_places.xml
@@ -32,7 +32,6 @@
     </text>
     <combo_box
      allow_text_entry="false"
-     enabled="false"
      follows="right|top"
      layout="topleft"
      height="18"
@@ -41,47 +40,20 @@
      max_chars="20"
      mouse_opaque="true"
      name="Category"
-     width="128"
-     visible="false">
-        <combo_item name="AnyCategory" value="any">
-            Any Category
-        </combo_item>
-        <combo_item name="LindenLocation" value="linden">
-            Linden Location
-        </combo_item>
-        <combo_item name="Arts&amp;Culture" value="arts">
-            Arts &amp; Culture
-        </combo_item>
-        <combo_item name="Business" value="store">
-            Business
-        </combo_item>
-        <combo_item name="Educational" value="educational">
-            Educational
-        </combo_item>
-        <combo_item name="Gaming" value="game">
-            Gaming
-        </combo_item>
-        <combo_item name="Hangout" value="gather">
-            Hangout
-        </combo_item>
-        <combo_item name="NewcomerFriendly" value="newcomer">
-            Newcomer Friendly
-        </combo_item>
-        <combo_item name="Parks&amp;Nature" value="park">
-            Parks &amp; Nature
-        </combo_item>
-        <combo_item name="Residential" value="home">
-            Residential
-        </combo_item>
-        <combo_item name="Shopping" value="shopping">
-            Shopping
-        </combo_item>
-        <combo_item name="Adult" value="adult">
-            Adult
-        </combo_item>
-        <combo_item name="Other" value="other">
-            Other
-        </combo_item>
+     width="128">
+        <combo_item name="AnyCategory" value="any" label="Any Category"/>
+        <combo_item name="LindenLocation" value="linden" label="Linden Location"/>
+        <combo_item name="Arts&amp;Culture" value="arts" label="Arts &amp; Culture"/>
+        <combo_item name="Business" value="store" label="Business"/>
+        <combo_item name="Educational" value="educational" label="Educational"/>
+        <combo_item name="Gaming" value="game" label="Gaming"/>
+        <combo_item name="Hangout" value="gather" label="Hangout"/>
+        <combo_item name="NewcomerFriendly" value="newcomer" label="Newcomer Friendly"/>
+        <combo_item name="Parks&amp;Nature" value="park" label="Parks &amp; Nature"/>
+        <combo_item name="Residential" value="home" label="Residential"/>
+        <combo_item name="Shopping" value="shopping" label="Shopping"/>
+        <combo_item name="Adult" value="adult" label="Adult"/>
+        <combo_item name="Other" value="other" label="Other"/>
     </combo_box>
     <check_box
      left_pad="20"
diff --git a/indra/newview/skins/default/xui/en/panel_event_info.xml b/indra/newview/skins/default/xui/en/panel_event_info.xml
index 9399a80610..b31918b919 100644
--- a/indra/newview/skins/default/xui/en/panel_event_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_event_info.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  border="false"
- can_close="true"
- can_minimize="true"
- can_resize="false"
  follows="all"
  height="570"
  left="0"