Ported slviewer-0-v12300-ReinstateOldSearchTabs.patch from the Hippo Viewer (opensim currently uses the old search all)

7 files changed, 386 insertions, 106 deletions

diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index 76cb26b..8018c31 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2009, Linden Research, Inc.
+ * Copyright (c) 2002-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -93,6 +93,7 @@ LLFloaterDirectory::LLFloaterDirectory(const std::string& name)
         // Build the floater with our tab panel classes
 
         LLCallbackMap::map_t factory_map;
+        factory_map["find_all_old_panel"] = LLCallbackMap(createFindAllOld, this);
         factory_map["find_all_panel"] = LLCallbackMap(createFindAll, this);
         factory_map["classified_panel"] = LLCallbackMap(createClassified, this);
         factory_map["events_panel"] = LLCallbackMap(createEvents, this);
@@ -119,6 +120,7 @@ LLFloaterDirectory::LLFloaterDirectory(const std::string& name)
                 mPanelAvatarp->selectTab(0);
         }
         
+        childSetTabChangeCallback("Directory Tabs", "find_all_old_panel", onTabChanged, this);
         childSetTabChangeCallback("Directory Tabs", "find_all_panel", onTabChanged, this);
         childSetTabChangeCallback("Directory Tabs", "classified_panel", onTabChanged, this);
         childSetTabChangeCallback("Directory Tabs", "events_panel", onTabChanged, this);
@@ -206,7 +208,14 @@ void* LLFloaterDirectory::createPeople(void* userdata)
 void* LLFloaterDirectory::createGroups(void* userdata)
 {
         LLFloaterDirectory *self = (LLFloaterDirectory*)userdata;
-        return new LLPanelDirGroups("people_groups", self);
+        return new LLPanelDirGroups("groups_panel", self);
+}
+
+// static
+void *LLFloaterDirectory::createFindAllOld(void* userdata)
+{
+        LLFloaterDirectory *self = (LLFloaterDirectory*)userdata;
+        return new LLPanelDirFindAllOld("find_all_old_panel", self);
 }
 
 // static
diff --git a/linden/indra/newview/llfloaterdirectory.h b/linden/indra/newview/llfloaterdirectory.h
index d8f8399..dd6a5e9 100644
--- a/linden/indra/newview/llfloaterdirectory.h
+++ b/linden/indra/newview/llfloaterdirectory.h
@@ -106,7 +106,8 @@ private:
         static void* createLand(void* userdata);
         static void* createPeople(void* userdata);
         static void* createGroups(void* userdata);
-
+        static void* createFindAllOld(void* userdata);
+ 
         static void* createClassifiedDetail(void* userdata);
         static void* createAvatarDetail(void* userdata);
         static void* createEventDetail(void* userdata);
diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp
index ee9aa69..cb83ee1 100644
--- a/linden/indra/newview/llpaneldirfind.cpp
+++ b/linden/indra/newview/llpaneldirfind.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
+ * Copyright (c) 2001-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -72,6 +72,8 @@
 #include "boost/lexical_cast.hpp"
 #endif
 
+#include "hippoGridManager.h"
+
 //---------------------------------------------------------------------------
 // LLPanelDirFindAll - Google search appliance based search
 //---------------------------------------------------------------------------
@@ -248,7 +250,15 @@ void LLPanelDirFind::focus()
 
 void LLPanelDirFind::navigateToDefaultPage()
 {
-        std::string start_url = getString("default_search_page");
+        std::string start_url = gSavedSettings.getString("SearchURLDefault");
+        // Note: beware porting stuff like below. We use the web panel in OpenSim as well as Second Life -- MC
+        /*if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_SECONDLIFE) {
+                start_url = getString("default_search_page");
+        } else {
+                start_url = gHippoGridManager->getConnectedGrid()->getSearchUrl();
+                start_url += "panel=" + getLabel() + "&";
+        }*/
+
         BOOL inc_pg = childGetValue("incpg").asBoolean();
         BOOL inc_mature = childGetValue("incmature").asBoolean();
         BOOL inc_adult = childGetValue("incadult").asBoolean();
@@ -272,9 +282,10 @@ void LLPanelDirFind::navigateToDefaultPage()
 std::string LLPanelDirFind::buildSearchURL(const std::string& search_text, const std::string& collection, 
                                                                                    bool inc_pg, bool inc_mature, bool inc_adult)
 {
-        std::string url = gSavedSettings.getString("SearchURLDefault");
-        if (!search_text.empty())
-        {
+        std::string url;
+        if (search_text.empty()) {
+                url = gHippoGridManager->getConnectedGrid()->getSearchUrl(HippoGridInfo::SEARCH_ALL_EMPTY);
+        } else {
                 // Replace spaces with "+" for use by Google search appliance
                 // Yes, this actually works for double-spaces
                 // " foo  bar" becomes "+foo++bar" and works fine. JC
@@ -296,7 +307,7 @@ std::string LLPanelDirFind::buildSearchURL(const std::string& search_text, const
                         "-._~$+!*'()";
                 std::string query = LLURI::escape(search_text_with_plus, allowed);
 
-                url = gSavedSettings.getString("SearchURLQuery");
+                url = gHippoGridManager->getConnectedGrid()->getSearchUrl(HippoGridInfo::SEARCH_ALL_QUERY);
                 std::string substring = "[QUERY]";
                 std::string::size_type where = url.find(substring);
                 if (where != std::string::npos)
@@ -321,7 +332,7 @@ std::string LLPanelDirFind::buildSearchURL(const std::string& search_text, const
 // static
 std::string LLPanelDirFind::getSearchURLSuffix(bool inc_pg, bool inc_mature, bool inc_adult)
 {
-        std::string url = gSavedSettings.getString("SearchURLSuffix2");
+        std::string url = gHippoGridManager->getConnectedGrid()->getSearchUrl(HippoGridInfo::SEARCH_ALL_TEMPLATE);
 
         // if the mature checkbox is unchecked, modify query to remove 
         // terms with given phrase from the result set
@@ -469,3 +480,133 @@ void LLPanelDirFindAllInterface::focus(LLPanelDirFindAll* panel)
         panel->focus();
 }
 
+//---------------------------------------------------------------------------
+// LLPanelDirFindAllOld - deprecated if new Google search works out. JC
+//---------------------------------------------------------------------------
+
+LLPanelDirFindAllOld::LLPanelDirFindAllOld(const std::string& name, LLFloaterDirectory* floater)
+        :       LLPanelDirBrowser(name, floater)
+{
+        mMinSearchChars = 3;
+}
+
+BOOL LLPanelDirFindAllOld::postBuild()
+{
+        LLPanelDirBrowser::postBuild();
+
+        childSetKeystrokeCallback("name", &LLPanelDirBrowser::onKeystrokeName, this);
+
+        childSetAction("Search", onClickSearch, this);
+        childDisable("Search");
+        setDefaultBtn( "Search" );
+
+        return TRUE;
+}
+
+LLPanelDirFindAllOld::~LLPanelDirFindAllOld()
+{
+        // Children all cleaned up by default view destructor.
+}
+
+// virtual
+void LLPanelDirFindAllOld::draw()
+{
+        updateMaturityCheckbox();
+        LLPanelDirBrowser::draw();
+}
+
+// static
+void LLPanelDirFindAllOld::onCommitScope(LLUICtrl* ctrl, void* data)
+{
+        LLPanelDirFindAllOld* self = (LLPanelDirFindAllOld*)data;
+        self->setFocus(TRUE);
+}
+
+// static
+void LLPanelDirFindAllOld::onClickSearch(void *userdata)
+{
+        LLPanelDirFindAllOld *self = (LLPanelDirFindAllOld *)userdata;
+
+        if (self->childGetValue("name").asString().length() < self->mMinSearchChars)
+        {
+                return;
+        };
+
+        BOOL inc_pg = self->childGetValue("incpg").asBoolean();
+        BOOL inc_mature = self->childGetValue("incmature").asBoolean();
+        BOOL inc_adult = self->childGetValue("incadult").asBoolean();
+        if (!(inc_pg || inc_mature || inc_adult))
+        {
+                LLNotifications::instance().add("NoContentToSearch");
+                return;
+        }
+
+        self->setupNewSearch();
+
+        // Figure out scope
+        U32 scope = 0x0;
+        scope |= DFQ_PEOPLE;    // people (not just online = 0x01 | 0x02)
+        // places handled below
+        scope |= DFQ_EVENTS;    // events
+        scope |= DFQ_GROUPS;    // groups
+        if (inc_pg)
+        {
+                scope |= DFQ_INC_PG;
+        }
+        if (inc_mature)
+        {
+                scope |= DFQ_INC_MATURE;
+        }
+        if (inc_adult)
+        {
+                scope |= DFQ_INC_ADULT;
+        }
+
+        // send the message
+        LLMessageSystem *msg = gMessageSystem;
+        S32 start_row = 0;
+        sendDirFindQuery(msg, self->mSearchID, self->childGetValue("name").asString(), scope, start_row);
+
+        // Also look up classified ads. JC 12/2005
+        BOOL filter_auto_renew = FALSE;
+        U32 classified_flags = pack_classified_flags_request(filter_auto_renew, inc_pg, inc_mature, inc_adult);
+        msg->newMessage("DirClassifiedQuery");
+        msg->nextBlock("AgentData");
+        msg->addUUID("AgentID", gAgent.getID());
+        msg->addUUID("SessionID", gAgent.getSessionID());
+        msg->nextBlock("QueryData");
+        msg->addUUID("QueryID", self->mSearchID);
+        msg->addString("QueryText", self->childGetValue("name").asString());
+        msg->addU32("QueryFlags", classified_flags);
+        msg->addU32("Category", 0);     // all categories
+        msg->addS32("QueryStart", 0);
+        gAgent.sendReliableMessage();
+
+        // Need to use separate find places query because places are
+        // sent using the more compact DirPlacesReply message.
+        U32 query_flags = DFQ_DWELL_SORT;
+        if (inc_pg)
+        {
+                query_flags |= DFQ_INC_PG;
+        }
+        if (inc_mature)
+        {
+                query_flags |= DFQ_INC_MATURE;
+        }
+        if (inc_adult)
+        {
+                query_flags |= DFQ_INC_ADULT;
+        }
+        msg->newMessage("DirPlacesQuery");
+        msg->nextBlock("AgentData");
+        msg->addUUID("AgentID", gAgent.getID() );
+        msg->addUUID("SessionID", gAgent.getSessionID());
+        msg->nextBlock("QueryData");
+        msg->addUUID("QueryID", self->mSearchID );
+        msg->addString("QueryText", self->childGetValue("name").asString());
+        msg->addU32("QueryFlags", query_flags );
+        msg->addS32("QueryStart", 0 ); // Always get the first 100 when using find ALL
+        msg->addS8("Category", LLParcel::C_ANY);
+        msg->addString("SimName", NULL);
+        gAgent.sendReliableMessage();
+}
diff --git a/linden/indra/newview/llpaneldirfind.h b/linden/indra/newview/llpaneldirfind.h
index a813d33..299060c 100644
--- a/linden/indra/newview/llpaneldirfind.h
+++ b/linden/indra/newview/llpaneldirfind.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
+ * Copyright (c) 2001-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -93,4 +93,20 @@ public:
         static void focus(LLPanelDirFindAll* panel);
 };
 
+
+class LLPanelDirFindAllOld : public LLPanelDirBrowser
+{
+public:
+        LLPanelDirFindAllOld(const std::string& name, LLFloaterDirectory* floater);
+        /*virtual*/ ~LLPanelDirFindAllOld();
+
+        /*virtual*/ BOOL postBuild();
+
+        /*virtual*/ void draw();
+
+        static void onClickSearch(void *userdata);
+        static void onCommitScope(LLUICtrl* ctrl, void* data);
+        static void onKeystrokeName(LLLineEditor* line, void* data);
+};
+
 #endif
diff --git a/linden/indra/newview/llpaneldirgroups.cpp b/linden/indra/newview/llpaneldirgroups.cpp
index e775952..1aa2e86 100644
--- a/linden/indra/newview/llpaneldirgroups.cpp
+++ b/linden/indra/newview/llpaneldirgroups.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
+ * Copyright (c) 2001-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -33,47 +33,111 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llpaneldirgroups.h"
-#include "llnotifications.h"
 
-#include "llwebbrowserctrl.h"
+// linden library includes
+#include "llagent.h"
+//#include "llfontgl.h"
+#include "message.h"
+#include "llqueryflags.h"
+#include "llviewercontrol.h"
+#include "llviewerwindow.h"
 
 LLPanelDirGroups::LLPanelDirGroups(const std::string& name, LLFloaterDirectory* floater)
-        :       LLPanelDirFind(name, floater, "groups_browser")
+        :       LLPanelDirBrowser(name, floater)
 {
+        mMinSearchChars = 3;
 }
 
 
-void LLPanelDirGroups::search(const std::string& search_text)
+BOOL LLPanelDirGroups::postBuild()
 {
-        if (!search_text.empty())
-        {
-                BOOL inc_pg = childGetValue("incpg").asBoolean();
-                BOOL inc_mature = childGetValue("incmature").asBoolean();
-                BOOL inc_adult = childGetValue("incadult").asBoolean();
-                if (!(inc_pg || inc_mature || inc_adult))
-                {
-                        LLNotifications::instance().add("NoContentToSearch");
-                        return;
-                }
-                
-                std::string selected_collection = "Groups";
-                std::string url = buildSearchURL(search_text, selected_collection, inc_pg, inc_mature, inc_adult);
-                if (mWebBrowser)
-                {
-                        mWebBrowser->navigateTo(url);
-                }
-        }
-        else
-        {
-                // empty search text
-                navigateToDefaultPage();
-        }
+        LLPanelDirBrowser::postBuild();
+
+        childSetKeystrokeCallback("name", &LLPanelDirBrowser::onKeystrokeName, this);
 
-        childSetText("search_editor", search_text);
+        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()
 {
         updateMaturityCheckbox();
         LLPanelDirBrowser::draw();
 }
+
+
+// virtual
+void LLPanelDirGroups::performQuery()
+{
+        std::string group_name = childGetValue("name").asString();
+        if (group_name.length() < mMinSearchChars)
+        {
+                return;
+        }
+
+    // "hi " is three chars but not a long-enough search
+        std::string query_string = group_name;
+        LLStringUtil::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 )
+        {
+                LLNotifications::instance().add("SeachFilteredOnShortWordsEmpty");
+                return;
+        };
+
+        BOOL inc_pg = childGetValue("incpg").asBoolean();
+        BOOL inc_mature = childGetValue("incmature").asBoolean();
+        BOOL inc_adult = childGetValue("incadult").asBoolean();
+        if (!(inc_pg || inc_mature || inc_adult))
+        {
+                LLNotifications::instance().add("NoContentToSearch");
+                return;
+        }
+
+        // if we filtered something out, display a popup
+        if ( query_was_filtered )
+        {
+                LLSD args;
+                args["[FINALQUERY]"] = query_string;
+                LLNotifications::instance().add("SeachFilteredOnShortWords", args);
+        };
+
+        setupNewSearch();
+
+        // groups
+        U32 scope = DFQ_GROUPS;
+        if (inc_pg)
+        {
+                scope |= DFQ_INC_PG;
+        }
+        if (inc_mature)
+        {
+                scope |= DFQ_INC_MATURE;
+        }
+        if (inc_adult)
+        {
+                scope |= DFQ_INC_ADULT;
+        }
+
+        mCurrentSortColumn = "score";
+        mCurrentSortAscending = FALSE;
+
+        // send the message
+        sendDirFindQuery(
+                gMessageSystem,
+                mSearchID,
+                query_string,
+                scope,
+                mSearchStart);
+}
diff --git a/linden/indra/newview/llpaneldirgroups.h b/linden/indra/newview/llpaneldirgroups.h
index d1248c0..5edb34d 100644
--- a/linden/indra/newview/llpaneldirgroups.h
+++ b/linden/indra/newview/llpaneldirgroups.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
+ * Copyright (c) 2001-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -33,15 +33,21 @@
 #ifndef LLPANELDIRGROUPS_H
 #define LLPANELDIRGROUPS_H
 
-#include "llpaneldirfind.h"
+#include "llpaneldirbrowser.h"
 
-class LLPanelDirGroups : public LLPanelDirFind
+class LLPanelDirGroups : public LLPanelDirBrowser
 {
 public:
         LLPanelDirGroups(const std::string& name, LLFloaterDirectory* floater);
+        virtual ~LLPanelDirGroups();
 
-        /*virtual*/ void search(const std::string& search_text);
         /*virtual*/ void draw();
+
+        /*virtual*/ BOOL postBuild();
+
+        /*virtual*/ void performQuery();
+
+        static void onClickSearch(void *userdata);
 };
 
 #endif
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
index a600c86..039c4f8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -1,12 +1,70 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="true" height="590" min_height="590" min_width="780"
-     name="directory" rect_control="FloaterFindRect2" title="Search Second Life"
+     name="directory" rect_control="FloaterFindRect2" title="Search"
      width="780">
         <tab_container bottom="-590" follows="left|top|right|bottom" height="570" left="0"
              mouse_opaque="false" name="Directory Tabs" tab_position="top" width="780">
                 <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
-                     label="All" left="1" mouse_opaque="false" name="find_all_panel" width="778">
+                     label="All" left="1" mouse_opaque="false" name="find_all_old_panel" width="778">
+                        <string name="searching_text">
+                                Searching...
+                        </string>
+                        <string name="not_found_text">
+                                None Found.
+                        </string>
+                        <button bottom="-553" follows="left|bottom" font="SansSerif" halign="center"
+                             height="20" label="&lt; Prev" label_selected="&lt; Prev" left="80"
+                             mouse_opaque="true" name="&lt; Prev" width="60" />
+                        <button bottom="-553" follows="left|bottom" font="SansSerif" halign="center"
+                             height="20" label="Next &gt;" label_selected="Next &gt;"
+                             mouse_opaque="true" name="Next &gt;" width="60" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+                             name="find" v_pad="0" width="50">
+                                Find:
+                        </text>
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+                             follows="left|top" font="SansSerif" height="18" left_delta="38"
+                             max_length="63" mouse_opaque="true" name="name" width="128" />
+                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
+                             label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
+                             name="Search" width="70" />
+                        <check_box bottom="-22" control_name="ShowPGSearchAll" follows="left|top"
+                             font="SansSerifSmall" height="16" initial_value="true"
+                             label="PG content" left_delta="78" mouse_opaque="true"
+                             name="incpg" width="156" />
+                        <check_box bottom="-22" control_name="ShowMatureSearchAll" follows="left|top"
+                             font="SansSerifSmall" height="16" initial_value="false"
+                             label="Mature content" left_delta="100" mouse_opaque="true"
+                             name="incmature" width="156" />
+                        <check_box bottom="-22" control_name="ShowAdultSearchAll" follows="left|top"
+                             font="SansSerifSmall" height="16" initial_value="false"
+                             label="Adult content" left_delta="120" mouse_opaque="true"
+                             name="incadult" width="156" />
+                        <scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true"
+                             draw_heading="false" fg_disable_color="1, 1, 1, 1"
+                             follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
+                             multi_select="false" name="results" search_column="1" width="339">
+                                <column label="" name="icon" width="24" />
+                                <column label="Name" name="name" width="235" />
+                                <column label="Price" name="price" width="90" />
+                                <column label="Time (PT)" name="date" width="90" />
+                                <column label="Time" name="time" width="-1" />
+                                <column label="Traffic" name="dwell" width="90" />
+                                <column label="Area" name="area" width="90" />
+                                <column label="[CURRENCY]/sq.m" name="per_meter" width="90" />
+                                <column label="Online" name="online" width="90" />
+                                <column label="Members" name="members" width="90" />
+                        </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" />
+                </panel>
+                <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
+                     label="All (web)" left="1" mouse_opaque="false" name="find_all_panel" width="778">
                         <string name="searching_text">
                                 Searching...
                         </string>
@@ -616,72 +674,57 @@ To buy direct, visit the land and click on the place name in the title bar.
                      label="Groups" left="1" mouse_opaque="false"
                      name="groups_panel"
                      width="778">
-      <string name="searching_text">Searching...</string>
-      <string name="not_found_text">None Found.</string>
+                        <string name="searching_text">
+                                Searching...
+                        </string>
+                        <string name="not_found_text">
+                                None Found.
+                        </string>
+                        <button bottom="-553" follows="left|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="left|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_drop_shadow_visible="false" border_visible="false"
                              bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
                              h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
                              name="find" v_pad="0" width="50">
                                 Find:
                         </text>
-      <line_editor bevel_style="in"
-                                                border_style="line"
-                                                border_thickness="1"
-                                                bottom="-24"
-                                                enabled="true"
-                                                follows="top|left|right"
-                                                font="SansSerif"
-                                                handle_edit_keys_directly="false"
-                                                commit_on_focus_lost="false"
-                                                height="18"
-                                                hidden="false"
-                                                label="Search"
-                                                left_delta="56"
-                                                width="160"
-                                                max_length="254"
-                                                mouse_opaque="true"
-                                                name="search_editor"
-                                                select_all_on_focus_received="false"
-                                                select_on_focus="false"
-                                                tab_group="1"
-                                                tool_tip="Search Second Life" />
-                        <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20" label="Back"
-                             left="230" name="back_btn" width="70" />
-                        <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20"
-                             label="Forward" left="304" name="forward_btn" width="70" />
-                        <button bottom="-48" follows="top|right" font="SansSerif" height="20"
-                             label="Search" left="121" name="search_btn" width="95" />
-          <check_box bottom="-22" control_name="ShowPGGroups" follows="right|top"
-                     font="SansSerifSmall" height="16" initial_value="true"
-                     label="PG content" left="420" mouse_opaque="true"
-                     name="incpg" width="156" />
-          <check_box bottom="-40" control_name="ShowMatureGroups" follows="right|top"
-                     font="SansSerifSmall" height="16" initial_value="true"
-                     label="Mature content" left="420" mouse_opaque="true"
-                     name="incmature" width="156" />
-          <check_box bottom="-58" control_name="ShowAdultGroups" follows="right|top"
-                     font="SansSerifSmall" height="16" initial_value="false"
-                     label="Adult content" left="420" mouse_opaque="true"
-                     name="incadult" width="156" />
-      <web_browser name="groups_browser"
-                                bottom="25"
-                                follows="top|left|bottom|right"
-                                font="SansSerifSmall"
-                                left="10"
-                                right="-10"
-                                top="-60" />
-      <text bottom="5"
-                                follows="bottom|left"
-                                halign="left"
-                                left="10"
-                                width="150"
-                                name="status_text"
-                                height="16" />
-      <string name="loading_text">Loading...</string>
-      <string name="done_text">Done</string>
-      <string name="redirect_404_url">http://secondlife.com/app/search/notfound.html</string>
-      <string name="default_search_page">"http://secondlife.com/app/search/index_groups.php?"</string>
-    </panel>
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+                             follows="left|top" font="SansSerif" height="18" left_delta="38"
+                             max_length="63" mouse_opaque="true" name="name" width="200" />
+                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
+                             label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
+                             name="Search" width="70" />
+                        <check_box bottom="-46" control_name="ShowPGGroups" follows="left|top"
+                             font="SansSerifSmall" height="16" initial_value="true"
+                             label="PG content" left="4" mouse_opaque="true"
+                             name="incpg" width="204" />
+                        <check_box bottom="-46" control_name="ShowMatureGroups" follows="left|top"
+                             font="SansSerifSmall" height="16" initial_value="true"
+                             label="Mature content" left_delta="90" mouse_opaque="true"
+                             name="incmature" width="204" />
+                        <check_box bottom="-46" control_name="ShowAdultGroups" follows="left|top"
+                             font="SansSerifSmall" height="16" initial_value="false"
+                             label="Adult content" left_delta="110" mouse_opaque="true"
+                             name="incadult" width="204" />
+                        <scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true"
+                             draw_heading="true"
+                             follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
+                             multi_select="false" name="results" search_column="2" width="339">
+                                <column label="" name="icon" sort="score" sort_ascending="false" width="24" />
+                                <column label="" name="type" width="-1" />
+                                <column dynamicwidth="true" label="Name" name="name" />
+                                <column halign="left" label="Members" name="members" sort_ascending="false" width="100" />
+                                <column label="" name="score" width="-1" />
+                        </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" />
+                </panel>
         </tab_container>
         <panel bottom="-580" follows="right|top" height="490" left="340"
              name="classified_details_panel" width="440" />