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, 9 insertions, 0 deletions

diff --git a/linden/indra/newview/panelradar.cpp b/linden/indra/newview/panelradar.cpp
index a868ee2..c94c0d1 100644
--- a/linden/indra/newview/panelradar.cpp
+++ b/linden/indra/newview/panelradar.cpp
@@ -32,6 +32,7 @@
 #include "llagent.h"
 #include "llchat.h"
 #include "llfloateravatarinfo.h"
+#include "llfloateravatarlist.h"
 #include "llfloaterchat.h"
 #include "llfloaterfriends.h"
 #include "llfloatergroupinvite.h"
@@ -95,6 +96,7 @@ BOOL PanelRadar::postBuild()
         //childSetAction("estate_eject_btn", onClickEjectFromEstate, this);
         //childSetAction("estate_ban_btn", onClickBanFromEstate, this);
         childSetAction("ban_btn", onClickBan, this);
+        childSetAction("full_radar_btn", onClickFullRadar, this);
 
         setDefaultBtn("im_btn");
 
@@ -1025,6 +1027,13 @@ void PanelRadar::onClickAR(void* user_data)
 }
 
 
+// static
+void PanelRadar::onClickFullRadar(void* user_data)
+{
+        LLFloaterAvatarList::toggle(NULL);
+}
+
+
 //static
 /* Don't use until the UI can be worked out
 void PanelRadar::onClickBanFromEstate(void* user_data)