Why go out for hamburgers when you have PRIME RIB DIRECTORY SEARCH at home?

indra/newview/llpanelsearchgroups.cpp

+/*
+ * @file llpanelsearchgroups.cpp
+ * @brief Groups search panel
+ *
+ * Copyright (c) 2014, Cinder Roxley <cinder@sdf.org>
+ *
+ * Permission is hereby granted, free of charge, to any person or organization
+ * obtaining a copy of the software and accompanying documentation covered by
+ * this license (the "Software") to use, reproduce, display, distribute,
+ * execute, and transmit the Software, and to prepare derivative works of the
+ * Software, and to permit third-parties to whom the Software is furnished to
+ * do so, all subject to the following:
+ *
+ * The copyright notices in the Software and this entire statement, including
+ * the above license grant, this restriction and the following disclaimer,
+ * must be included in all copies of the Software, in whole or in part, and
+ * all derivative works of the Software, unless such copies or derivative
+ * works are solely in the form of machine-executable object code generated by
+ * a source language processor.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include "llviewerprecompiledheaders.h"
+#include "llpanelsearchgroups.h"
+#include "llfloaterdirectory.h"
+
+#include "llfloaterreg.h"
+#include "llqueryflags.h"
+
+#include "llagent.h"
+#include "llnotificationsutil.h"
+#include "llsearcheditor.h"
+#include "llsearchhistory.h"
+
+static LLPanelInjector<LLPanelSearchGroups> t_panel_search_groups("panel_search_groups");
+
+LLPanelSearchGroups::LLPanelSearchGroups()
+	: LLPanelSearch()
+	, mSearchEditor(nullptr)
+{
+	mCommitCallbackRegistrar.add("Search.query", boost::bind(&LLPanelSearchGroups::onCommitSearch, this, _1));
+}
+
+BOOL LLPanelSearchGroups::postBuild()
+{
+	mSearchEditor = getChild<LLSearchEditor>("search_bar");
+	//mSearchEditor->setKeystrokeCallback(boost::bind(&LLPanelSearchGroups::onCommitSearch, this, _1));
+	
+	return TRUE;
+}
+
+void LLPanelSearchGroups::onCommitSearch(LLUICtrl* ctrl)
+{
+	LLSearchEditor* pSearchEditor = dynamic_cast<LLSearchEditor*>(ctrl);
+	if (pSearchEditor)
+	{
+		std::string text = pSearchEditor->getText();
+		LLStringUtil::trim(text);
+		if (text.length() <= MIN_SEARCH_STRING_SIZE)
+			LLSearchHistory::getInstance()->addEntry(text);
+	}
+	search();
+}
+
+void LLPanelSearchGroups::search()
+{
+	LLDirQuery query;
+	query.type = SE_GROUPS;
+	query.results_per_page = 100;
+	query.text = mSearchEditor->getText();
+	LLStringUtil::trim(query.text);
+	
+	static LLUICachedControl<bool> inc_pg("ShowPGGroups", true);
+	static LLUICachedControl<bool> inc_mature("ShowMatureGroups", false);
+	static LLUICachedControl<bool> inc_adult("ShowAdultGroups", false);
+	if (!(inc_pg || inc_mature || inc_adult))
+	{
+		LLNotificationsUtil::add("NoContentToSearch");
+		return;
+	}
+
+	if (inc_pg)
+		query.scope |= DFQ_INC_PG;
+	if (inc_mature && gAgent.canAccessMature())
+		query.scope |= DFQ_INC_MATURE;
+	if (inc_adult && gAgent.canAccessAdult())
+		query.scope |= DFQ_INC_ADULT;
+	query.scope |= DFQ_GROUPS;
+	
+	mFloater->queryDirectory(query, true);
+}

indra/newview/llpanelsearchgroups.h

+/*
+ * @file llpanelsearchgroups.h
+ * @brief Groups search panel
+ *
+ * Copyright (c) 2014, Cinder Roxley <cinder@sdf.org>
+ *
+ * Permission is hereby granted, free of charge, to any person or organization
+ * obtaining a copy of the software and accompanying documentation covered by
+ * this license (the "Software") to use, reproduce, display, distribute,
+ * execute, and transmit the Software, and to prepare derivative works of the
+ * Software, and to permit third-parties to whom the Software is furnished to
+ * do so, all subject to the following:
+ *
+ * The copyright notices in the Software and this entire statement, including
+ * the above license grant, this restriction and the following disclaimer,
+ * must be included in all copies of the Software, in whole or in part, and
+ * all derivative works of the Software, unless such copies or derivative
+ * works are solely in the form of machine-executable object code generated by
+ * a source language processor.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef LL_PANELSEARCHGROUPS_H
+#define LL_PANELSEARCHGROUPS_H
+
+#include "llpanelsearchbase.h"
+
+class LLSearchEditor;
+
+class LLPanelSearchGroups : public LLPanelSearch
+{
+public:
+	LLPanelSearchGroups();
+	/*virtual*/ BOOL postBuild() override;
+	
+private:
+	/*virtual*/ void onCommitSearch(LLUICtrl* ctrl) override;
+	/*virtual*/ void search() override;
+	
+	LLSearchEditor* mSearchEditor;
+};
+
+#endif // LL_PANELSEARCHGROUPS_H

indra/newview/llpanelsearchlandsales.cpp

+/*
+ * @file llpanelsearchlandsales.cpp
+ * @brief Groups search panel
+ *
+ * Copyright (c) 2014, Cinder Roxley <cinder@sdf.org>
+ *
+ * Permission is hereby granted, free of charge, to any person or organization
+ * obtaining a copy of the software and accompanying documentation covered by
+ * this license (the "Software") to use, reproduce, display, distribute,
+ * execute, and transmit the Software, and to prepare derivative works of the
+ * Software, and to permit third-parties to whom the Software is furnished to
+ * do so, all subject to the following:
+ *
+ * The copyright notices in the Software and this entire statement, including
+ * the above license grant, this restriction and the following disclaimer,
+ * must be included in all copies of the Software, in whole or in part, and
+ * all derivative works of the Software, unless such copies or derivative
+ * works are solely in the form of machine-executable object code generated by
+ * a source language processor.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include "llviewerprecompiledheaders.h"
+#include "llpanelsearchlandsales.h"
+#include "llfloaterdirectory.h"
+
+#include "llfloaterreg.h"
+#include "llqueryflags.h"
+
+#include "llagent.h"
+#include "llnotificationsutil.h"
+#include "llsearcheditor.h"
+#include "llsearchhistory.h"
+#include "llviewercontrol.h"
+
+static LLPanelInjector<LLPanelSearchLandSales> t_panel_search_land_sales("panel_search_landsales");
+
+LLPanelSearchLandSales::LLPanelSearchLandSales()
+:	LLPanelSearch()
+{
+	mCommitCallbackRegistrar.add("Search.query", boost::bind(&LLPanelSearchLandSales::onCommitSearch, this, _1));
+}
+
+BOOL LLPanelSearchLandSales::postBuild()
+{
+	return TRUE;
+}
+
+void LLPanelSearchLandSales::onCommitSearch(LLUICtrl* ctrl)
+{
+	search();
+}
+
+void LLPanelSearchLandSales::search()
+{
+	LLDirQuery query;
+	query.type = SE_LANDSALES;
+	query.results_per_page = 100;
+	
+	static LLUICachedControl<bool> inc_pg("ShowPGLand", true);
+	static LLUICachedControl<bool> inc_mature("ShowMatureLand", false);
+	static LLUICachedControl<bool> inc_adult("ShowAdultLand", false);
+	static LLUICachedControl<bool> limit_price("FindLandPrice", true);
+	static LLUICachedControl<bool> limit_area("FindLandArea", true);
+	if (!(inc_pg || inc_mature || inc_adult))
+	{
+		LLNotificationsUtil::add("NoContentToSearch");
+		return;
+	}
+
+	const std::string& type = gSavedSettings.getString("FindLandType");
+	if (type == "All")
+		query.category_int = ST_ALL;
+	else if (type == "Auction")
+		query.category_int = ST_AUCTION;
+	else if (type == "Mainland")
+		query.category_int = ST_MAINLAND;
+	else if (type == "Estate")
+		query.category_int = ST_ESTATE;
+	
+	if (gAgent.wantsPGOnly())
+		query.scope |= DFQ_PG_SIMS_ONLY;
+	if (inc_pg)
+		query.scope |= DFQ_INC_PG;
+	if (inc_mature && gAgent.canAccessMature())
+		query.scope |= DFQ_INC_MATURE;
+	if (inc_adult && gAgent.canAccessAdult())
+		query.scope |= DFQ_INC_ADULT;
+	
+	const std::string& sort = gSavedSettings.getString("FindLandSort");
+	if (sort == "Name")
+		query.scope |= DFQ_NAME_SORT;
+	else if (sort == "Price")
+		query.scope |= DFQ_PRICE_SORT;
+	else if (sort == "PPM")
+		query.scope |= DFQ_PER_METER_SORT;
+	else if (sort == "Area")
+		query.scope |= DFQ_AREA_SORT;
+
+	if (gSavedSettings.getBOOL("FindLandSortAscending"))
+		query.scope |= DFQ_SORT_ASC;
+	if (limit_price)
+		query.scope |= DFQ_LIMIT_BY_PRICE;
+	if (limit_area)
+		query.scope |= DFQ_LIMIT_BY_AREA;
+	query.price = childGetValue("edit_price").asInteger();
+	query.area = childGetValue("edit_area").asInteger();
+	
+	mFloater->queryDirectory(query, true);
+}

indra/newview/llpanelsearchlandsales.h

+/*
+ * @file llpanelsearchlandsales.h
+ * @brief Land sale search panel
+ *
+ * Copyright (c) 2014, Cinder Roxley <cinder@sdf.org>
+ *
+ * Permission is hereby granted, free of charge, to any person or organization
+ * obtaining a copy of the software and accompanying documentation covered by
+ * this license (the "Software") to use, reproduce, display, distribute,
+ * execute, and transmit the Software, and to prepare derivative works of the
+ * Software, and to permit third-parties to whom the Software is furnished to
+ * do so, all subject to the following:
+ *
+ * The copyright notices in the Software and this entire statement, including
+ * the above license grant, this restriction and the following disclaimer,
+ * must be included in all copies of the Software, in whole or in part, and
+ * all derivative works of the Software, unless such copies or derivative
+ * works are solely in the form of machine-executable object code generated by
+ * a source language processor.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef LL_PANELSEARCHLANDSALES_H
+#define LL_PANELSEARCHLANDSALES_H
+
+#include "llpanelsearchbase.h"
+
+class LLPanelSearchLandSales : public LLPanelSearch
+{
+public:
+	LLPanelSearchLandSales();
+	/*virtual*/ BOOL postBuild() override;
+	
+private:
+	/*virtual*/ void search() override;
+	/*virtual*/ void onCommitSearch(LLUICtrl* ctrl) override;
+};
+
+#endif // LL_PANELSEARCHLANDSALES_H

indra/newview/llsearchcombobox.h

@@ -61,11 +61,6 @@ class LLSearchComboBox : public LLComboBox
 
 	~LLSearchComboBox();
 
-	/**
-	 * Sets focus to text box
-	 */
-	void focusTextEntry();
-
 protected:
 
 	LLSearchComboBox(const Params&p);
@@ -98,6 +93,11 @@ class LLSearchComboBox : public LLComboBox
 	 */
 	void onSelectionCommit();
 
+	/**
+	 * Sets focus to text box
+	 */
+	void focusTextEntry();
+
 	LLButton* mSearchButton;
 };
 

indra/newview/llviewerinput.cpp

@@ -48,8 +48,6 @@
 #include "llfloatercamera.h"
 #include "llinitparam.h"
 #include "llselectmgr.h"
-#include "fsfloatersearch.h"
-#include "llfloaterwebcontent.h"
 // [RLVa:KB] - Checked: 2021-07-29 (RLVa-1.4.4a)
 #include "rlvactions.h"
 #include "rlvhandler.h"
@@ -676,12 +674,6 @@ bool start_chat( EKeystate s )
 
 bool start_gesture( EKeystate s )
 {
-    LLFloater* focused_floater = gFloaterView->getFocusedFloater();
-    if (focused_floater && (dynamic_cast<LLFloaterWebContent*>(focused_floater) || dynamic_cast<FSFloaterSearch*>(focused_floater)))
-    {
-        return true;
-    }
-
 	LLUICtrl* focus_ctrlp = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
 	if (KEYSTATE_UP == s &&
 		! (focus_ctrlp && focus_ctrlp->acceptsTextInput()))