Second Life viewer sources 1.20.7

1 files changed, 15 insertions, 85 deletions

diff --git a/linden/indra/newview/llpaneldirgroups.cpp b/linden/indra/newview/llpaneldirgroups.cpp
index 0a0a14d..b765e99 100644
--- a/linden/indra/newview/llpaneldirgroups.cpp
+++ b/linden/indra/newview/llpaneldirgroups.cpp
@@ -33,101 +33,31 @@
 
 #include "llpaneldirgroups.h"
 
-// linden library includes
-#include "llagent.h"
-//#include "llfontgl.h"
-#include "message.h"
-#include "llqueryflags.h"
-#include "llviewercontrol.h"
-#include "llviewerwindow.h"
-
-// viewer project includes
+#include "llwebbrowserctrl.h"
 
 LLPanelDirGroups::LLPanelDirGroups(const std::string& name, LLFloaterDirectory* floater)
-        :       LLPanelDirBrowser(name, floater)
-{
-        mMinSearchChars = 3;
-}
-
-
-BOOL LLPanelDirGroups::postBuild()
+        :       LLPanelDirFind(name, floater, "groups_browser")
 {
-        LLPanelDirBrowser::postBuild();
-
-        childSetKeystrokeCallback("name", &LLPanelDirBrowser::onKeystrokeName, this);
-
-        childSetAction("Search", &LLPanelDirBrowser::onClickSearchCore, this);
-        childDisable("Search");
-        setDefaultBtn( "Search" );
-
-        return TRUE;
 }
 
-LLPanelDirGroups::~LLPanelDirGroups()
-{
-        // Children all cleaned up by default view destructor.
-}
 
-// virtual
-void LLPanelDirGroups::draw()
+void LLPanelDirGroups::search(const std::string& search_text)
 {
-        // You only have a choice if you are mature
-        childSetVisible("incmature", !gAgent.isTeen());
-        childSetValue("incmature", gSavedSettings.getBOOL("ShowMatureGroups"));
-        
-        LLPanelDirBrowser::draw();
-}
-
-
-// virtual
-void LLPanelDirGroups::performQuery()
-{
-        std::string group_name = childGetValue("name").asString();
-        if (group_name.length() < mMinSearchChars)
+        if (!search_text.empty())
         {
-                return;
+                bool mature = childGetValue( "mature_check" ).asBoolean();
+                std::string selected_collection = "Groups";
+                std::string url = buildSearchURL(search_text, selected_collection, mature);
+                if (mWebBrowser)
+                {
+                        mWebBrowser->navigateTo(url);
+                }
         }
-
-    // "hi " is three chars but not a long-enough search
-        std::string query_string = group_name;
-        LLString::trim( query_string );
-        bool query_was_filtered = (query_string != group_name);
-
-        // possible we threw away all the short words in the query so check length
-        if ( query_string.length() < mMinSearchChars )
-        {
-                gViewerWindow->alertXml("SeachFilteredOnShortWordsEmpty");
-                return;
-        };
-
-        // if we filtered something out, display a popup
-        if ( query_was_filtered )
+        else
         {
-                LLString::format_map_t args;
-                args["[FINALQUERY]"] = query_string;
-                gViewerWindow->alertXml("SeachFilteredOnShortWords", args);
-        };
-
-        setupNewSearch();
-
-        // groups
-        U32 scope = DFQ_GROUPS;
-
-        // Check group mature filter.
-        if ( !gSavedSettings.getBOOL("ShowMatureGroups") 
-                                   || gAgent.isTeen() )
-        {
-                scope |= DFQ_FILTER_MATURE;
+                // empty search text
+                navigateToDefaultPage();
         }
 
-        mCurrentSortColumn = "score";
-        mCurrentSortAscending = FALSE;
-
-        // send the message
-        sendDirFindQuery(
-                gMessageSystem,
-                mSearchID,
-                query_string,
-                scope,
-                mSearchStart);
+        childSetText("search_editor", search_text);
 }