Added area search to the advanced menu, port from Emerald by Henri Beauchamp

1 files changed, 12 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index a95c3c6..6a7a818 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -65,6 +65,8 @@
 // newview includes
 #include "llagent.h"
 
+#include "jcfloaterareasearch.h"
+
 #include "llagentpilot.h"
 #include "llbox.h"
 #include "llcallingcard.h"
@@ -5880,6 +5882,10 @@ class LLShowFloater : public view_listener_t
                 {
                         LLFloaterRegionInfo::showInstance();
                 }
+                else if (floater_name == "areasearch")
+                {
+                        JCFloaterAreaSearch::toggle();
+                }
                 else if (floater_name == "grid options")
                 {
                         LLFloaterBuildOptions::show(NULL);
@@ -6007,6 +6013,12 @@ class LLFloaterVisible : public view_listener_t
                         LLInventoryView* iv = LLInventoryView::getActiveInventory(); 
                         new_value = (NULL != iv && TRUE == iv->getVisible());
                 }
+                else if (floater_name == "areasearch")
+                {
+                        JCFloaterAreaSearch* instn = JCFloaterAreaSearch::getInstance();
+                        if (!instn) new_value = false;
+                        else new_value = instn->getVisible();
+                }
                 gMenuHolder->findControl(control_name)->setValue(new_value);
                 return true;
         }