Merge remote-tracking branch 'imprudence/exp' into exp

Conflicts (for future reference):
	linden/indra/llcommon/llstring.cpp
	linden/indra/newview/llpanelnetwork.cpp
	linden/indra/newview/llselectmgr.cpp
	linden/indra/newview/llstartup.cpp
	linden/indra/newview/lltoolmgr.cpp
	linden/indra/newview/llvoavatar.cpp

1 files changed, 26 insertions, 15 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 0d34f18..b85f3ca 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -89,6 +89,7 @@
 #include "llfloateractivespeakers.h"
 #include "llfloateranimpreview.h"
 #include "llfloateravatarinfo.h"
+#include "llfloateravatarlist.h"
 #include "llfloateravatartextures.h"
 #include "llfloaterbeacons.h"
 #include "llfloaterbuildoptions.h"
@@ -725,10 +726,26 @@ void init_menus()
         gLoginMenuBarView->setBackgroundColor( color );
 
         gMenuHolder->addChild(gLoginMenuBarView);
-        
 }
 
 
+void update_grid_specific_menus()
+{
+        if (!gMenuHolder || !gMenuBarView)
+        {
+                return;
+        }
+        else
+        {
+                // Disable these when we're not on Second Life grids 
+                // (or don't have URLS for them if non-SL grids start using 'em) -- MC
+                gMenuHolder->childSetEnabled("Manage My Account...", gHippoGridManager->getConnectedGrid()->isSecondLife());
+                gMenuHolder->childSetVisible("Manage My Account...", gHippoGridManager->getConnectedGrid()->isSecondLife());
+                gMenuHolder->childSetEnabled("Account History...", gHippoGridManager->getConnectedGrid()->isSecondLife());
+                gMenuHolder->childSetVisible("Account History...", gHippoGridManager->getConnectedGrid()->isSecondLife());
+        }
+}
+
 
 void init_client_menu(LLMenuGL* menu)
 {
@@ -6131,6 +6148,10 @@ class LLShowFloater : public view_listener_t
                 {
                         LLFloaterPerms::toggleInstance(LLSD());
                 }
+                else if (floater_name == "full radar")
+                {
+                        LLFloaterAvatarList::toggle(NULL);
+                }
                 return true;
         }
 };
@@ -6205,6 +6226,10 @@ class LLFloaterVisible : public view_listener_t
                         if (!instn) new_value = false;
                         else new_value = instn->getVisible();
                 }
+                else if (floater_name == "full radar")
+                {
+                        new_value = (LLFloaterAvatarList::getInstance() != NULL);
+                }
                 gMenuHolder->findControl(control_name)->setValue(new_value);
                 return true;
         }
@@ -10699,19 +10724,6 @@ class LLAdvancedDumpAvatarLocalTextures : public view_listener_t
         }
 };
 
-///////////////////////////////////
-// Reload Avatar Cloud Particles //
-///////////////////////////////////
-
-
-class LLAdvancedReloadAvatarCloudParticle : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLVOAvatar::initCloud();
-                return true;
-        }
-};
 
 ///////////
 // Crash //
@@ -11501,7 +11513,6 @@ void initialize_menus()
         addMenu(new LLAdvancedDumpAttachments(), "Advanced.DumpAttachments");
         addMenu(new LLAdvancedDebugAvatarTextures(), "Advanced.DebugAvatarTextures");
         addMenu(new LLAdvancedDumpAvatarLocalTextures(), "Advanced.DumpAvatarLocalTextures");
-        addMenu(new LLAdvancedReloadAvatarCloudParticle(), "Advanced.ReloadAvatarCloudParticle");
 
         // Advanced > Crash
         addMenu(new LLAdvancedCrash(), "Advanced.Crash");