Mac build fix and clean up

14 files changed, 30 insertions, 26 deletions

diff --git a/indra/newview/llfloaterdirectory.cpp b/indra/newview/llfloaterdirectory.cpp
index 35f0f7ef5a..e062ca7ac6 100644
--- a/indra/newview/llfloaterdirectory.cpp
+++ b/indra/newview/llfloaterdirectory.cpp
@@ -46,7 +46,6 @@
 
 LLFloaterDirectory::LLFloaterDirectory(const std::string& name)
 :   LLFloater(name),
-    mMinimizing(false),
     mPanelAvatarp(nullptr),
     mPanelGroupp(nullptr),
     mPanelPlacep(nullptr),
diff --git a/indra/newview/llfloaterdirectory.h b/indra/newview/llfloaterdirectory.h
index a5f39c895d..de788443be 100644
--- a/indra/newview/llfloaterdirectory.h
+++ b/indra/newview/llfloaterdirectory.h
@@ -73,7 +73,6 @@ public:
     LLPanelClassifiedInfo* mPanelClassifiedp;
 
 private:
-    bool mMinimizing; // HACK: see reshape() for details
     static LLFloaterDirectory *sInstance;
 };
 
diff --git a/indra/newview/llpaneldirbrowser.cpp b/indra/newview/llpaneldirbrowser.cpp
index 5431a3af98..8468520c11 100644
--- a/indra/newview/llpaneldirbrowser.cpp
+++ b/indra/newview/llpaneldirbrowser.cpp
@@ -70,7 +70,7 @@ LLPanelDirBrowser::LLPanelDirBrowser()
     mCurrentSortColumn("name"),
     mCurrentSortAscending(true),
     mSearchStart(0),
-    mResultsPerPage(100),
+    mResultsPerPage(RESULTS_PER_PAGE_DEFAULT),
     mResultsReceived(0),
     mMinSearchChars(1),
     mResultsContents(),
diff --git a/indra/newview/llpaneldirbrowser.h b/indra/newview/llpaneldirbrowser.h
index 0e82f7e423..cb947f8507 100644
--- a/indra/newview/llpaneldirbrowser.h
+++ b/indra/newview/llpaneldirbrowser.h
@@ -45,9 +45,9 @@ public:
     void setFloaterDirectory(LLFloaterDirectory* floater) { mFloaterDirectory = floater; }
 
     // Use to get periodic updates.
-    virtual void draw();
+    void draw() override;
 
-    virtual void onVisibilityChange(bool curVisibilityIn);
+    void onVisibilityChange(bool curVisibilityIn) override;
 
     // Redo your search for the prev/next page of results
     virtual void prevPage();
@@ -139,6 +139,9 @@ protected:
     LLButton* mNextPageBtn;
 };
 
+constexpr S32 RESULTS_PER_PAGE_DEFAULT = 100;
+constexpr S32 RESULTS_PER_PAGE_EVENTS = 200;
+
 // Codes used for sorting by type.
 const S32 INVALID_CODE = -1;
 const S32 EVENT_CODE = 0;
diff --git a/indra/newview/llpaneldirclassified.cpp b/indra/newview/llpaneldirclassified.cpp
index f055e6f05a..ca625b956b 100644
--- a/indra/newview/llpaneldirclassified.cpp
+++ b/indra/newview/llpaneldirclassified.cpp
@@ -62,6 +62,7 @@ bool LLPanelDirClassified::postBuild()
     LLPanelDirBrowser::postBuild();
 
     childSetAction("Search", onClickSearchCore, this);
+    setDefaultBtn("Search");
     return true;
 }
 
diff --git a/indra/newview/llpaneldirevents.cpp b/indra/newview/llpaneldirevents.cpp
index 868ccc4c33..63eba04296 100644
--- a/indra/newview/llpaneldirevents.cpp
+++ b/indra/newview/llpaneldirevents.cpp
@@ -45,12 +45,14 @@
 
 static LLPanelInjector<LLPanelDirEvents> t_panel_dir_events("panel_dir_events");
 
+constexpr S32 DAY_TO_SEC = 24 * 60 * 60;
+
 LLPanelDirEvents::LLPanelDirEvents()
     : LLPanelDirBrowser(),
     mDay(0)
 {
     // more results per page for this
-    mResultsPerPage = 200;
+    mResultsPerPage = RESULTS_PER_PAGE_EVENTS;
 }
 
 bool LLPanelDirEvents::postBuild()
@@ -59,8 +61,8 @@ bool LLPanelDirEvents::postBuild()
 
     childSetCommitCallback("date_mode", onDateModeCallback, this);
 
-    childSetAction("<<", onBackBtn, this);
-    childSetAction(">>", onForwardBtn, this);
+    childSetAction("back_btn", onBackBtn, this);
+    childSetAction("forward_btn", onForwardBtn, this);
 
     childSetCommitCallback("mature", onCommitMature, this);
 
@@ -88,7 +90,7 @@ void LLPanelDirEvents::setDay(S32 day)
     time_t utc_time = time_corrected();
 
     // Correct for offset
-    utc_time += day * 24 * 60 * 60;
+    utc_time += day * DAY_TO_SEC;
 
     // There's only one internal tm buffer.
     struct tm* internal_time;
@@ -120,7 +122,7 @@ void LLPanelDirEvents::performQueryOrDelete(U32 event_id)
     time_t utc_time = time_corrected();
 
     // Correct for offset
-    utc_time += relative_day * 24 * 60 * 60;
+    utc_time += relative_day * DAY_TO_SEC;
 
     // There's only one internal tm buffer.
     struct tm* internal_time;
@@ -208,13 +210,13 @@ void LLPanelDirEvents::onDateModeCallback(LLUICtrl* ctrl, void *data)
     LLPanelDirEvents* self = (LLPanelDirEvents*)data;
     if (self->childGetValue("date_mode").asString() == "date")
     {
-        self->childEnable(">>");
-        self->childEnable("<<");
+        self->childEnable("forward_btn");
+        self->childEnable("back_btn");
     }
     else
     {
-        self->childDisable(">>");
-        self->childDisable("<<");
+        self->childDisable("forward_btn");
+        self->childDisable("back_btn");
     }
 }
 
diff --git a/indra/newview/llpaneldirevents.h b/indra/newview/llpaneldirevents.h
index 6a86826749..596abc5f0e 100644
--- a/indra/newview/llpaneldirevents.h
+++ b/indra/newview/llpaneldirevents.h
@@ -40,7 +40,7 @@ public:
 
     bool postBuild() override;
 
-    /*virtual*/ void performQuery();
+    /*virtual*/ void performQuery() override;
 
     void performQueryOrDelete(U32 event_id);
 
diff --git a/indra/newview/llpaneldirgroups.cpp b/indra/newview/llpaneldirgroups.cpp
index 9a8f418a65..992d92091c 100644
--- a/indra/newview/llpaneldirgroups.cpp
+++ b/indra/newview/llpaneldirgroups.cpp
@@ -49,7 +49,6 @@ bool LLPanelDirGroups::postBuild()
     //getChild<LLLineEditor>("name")->setKeystrokeCallback(boost::bind(&LLPanelDirBrowser::onKeystrokeName, _1, _2), NULL);
 
     childSetAction("Search", &LLPanelDirBrowser::onClickSearchCore, this);
-    //childDisable("Search");
     setDefaultBtn( "Search" );
 
     return true;
diff --git a/indra/newview/llpaneldirpeople.cpp b/indra/newview/llpaneldirpeople.cpp
index 976b179fb8..6a55e3bc7c 100644
--- a/indra/newview/llpaneldirpeople.cpp
+++ b/indra/newview/llpaneldirpeople.cpp
@@ -49,7 +49,6 @@ bool LLPanelDirPeople::postBuild()
     //getChild<LLLineEditor>("name")->setKeystrokeCallback(boost::bind(&LLPanelDirBrowser::onKeystrokeName, _1, _2), NULL);
 
     childSetAction("Search", &LLPanelDirBrowser::onClickSearchCore, this);
-    //childDisable("Search");
     setDefaultBtn( "Search" );
 
     return true;
diff --git a/indra/newview/llpaneldirplaces.cpp b/indra/newview/llpaneldirplaces.cpp
index 57d9d556b6..2d54566038 100644
--- a/indra/newview/llpaneldirplaces.cpp
+++ b/indra/newview/llpaneldirplaces.cpp
@@ -60,7 +60,7 @@ bool LLPanelDirPlaces::postBuild()
     //getChild<LLLineEditor>("name")->setKeystrokeCallback(boost::bind(&LLPanelDirBrowser::onKeystrokeName, _1, _2), NULL);
 
     childSetAction("Search", &LLPanelDirBrowser::onClickSearchCore, this);
-    //childDisable("Search");
+    setDefaultBtn("Search");
 
     mCurrentSortColumn = "dwell";
     mCurrentSortAscending = false;
diff --git a/indra/newview/llpaneldirplaces.h b/indra/newview/llpaneldirplaces.h
index 5d91d75810..069414ebf5 100644
--- a/indra/newview/llpaneldirplaces.h
+++ b/indra/newview/llpaneldirplaces.h
@@ -39,7 +39,7 @@ public:
 
     bool postBuild() override;
 
-    void performQuery();
+    void performQuery() override;
 
     // Initially fill in some data for the panel.
     void initialQuery();
diff --git a/indra/newview/llpaneldirweb.h b/indra/newview/llpaneldirweb.h
index 0287c5006c..db7bdc4a6a 100644
--- a/indra/newview/llpaneldirweb.h
+++ b/indra/newview/llpaneldirweb.h
@@ -41,10 +41,10 @@ public:
     ~LLPanelDirWeb();
 
     bool postBuild() override;
-    void onVisibilityChange(bool new_visibility);
-    void draw();
+    void onVisibilityChange(bool new_visibility) override;
+    void draw() override;
 
-    void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
+    void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) override;
 
     void navigateToDefaultPage();
 
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index a17c2f71df..ab5235c3ad 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -232,7 +232,8 @@ public:
                 "upload_model",
                 "upload_script",
                 "upload_sound",
-                "bulk_upload"
+                "bulk_upload",
+                "legacy_search"
             };
             return std::find(blacklist_clicked.begin(), blacklist_clicked.end(), fl_name) == blacklist_clicked.end();
         }
@@ -284,7 +285,8 @@ public:
                 "upload_script",
                 "upload_sound",
                 "bulk_upload",
-                "slapp_test"
+                "slapp_test",
+                "legacy_search"
             };
             return std::find(blacklist_untrusted.begin(), blacklist_untrusted.end(), fl_name) == blacklist_untrusted.end();
         }
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 ffbbbeb251..b194ce5646 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_events.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_events.xml
@@ -261,7 +261,7 @@
      label_selected="&lt;&lt;"
      left_delta="54"
      mouse_opaque="true"
-     name="&lt;&lt;"
+     name="back_btn"
      tool_tip="Go back a day"
      width="20" />
     <text
@@ -294,7 +294,7 @@
      label_selected="&gt;&gt;"
      left_delta="50"
      mouse_opaque="true"
-     name="&gt;&gt;"
+     name="forward_btn"
      tool_tip="Go forward a day"
      width="20" />
 </panel>