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

Unless otherwise stated, Imprudence changes accepted.  The three images seem to be the same.
Conflicts:
	.gitignore
	linden/indra/develop.py
	linden/indra/llcommon/llsdserialize_xml.cpp
	linden/indra/newview/CMakeLists.txt
		Manually combined MOAP, OTR, and WL changes from both.
	linden/indra/newview/app_settings/default_grids.xml
		Manually merged the grid collection.
		Also updated IG info.
	linden/indra/newview/hippoupdate.cpp
	linden/indra/newview/llettherebelight.cpp
		Just used the Imprudence copy.
	linden/indra/newview/llviewermessage.cpp
		Keep unbranding.
	linden/indra/newview/llvoavatar.cpp
		Manually merge client tags.
	linden/indra/newview/res/viewerRes.rc
		Manually merge version from Impy.
	linden/indra/newview/skins/dark/colors_base.xml
		Keep unbranding.
	linden/indra/newview/skins/default/html/unabletoconnect.png
	linden/indra/newview/skins/default/textures/icon_top_pick.tga
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
		Manual merging of contributors.
	linden/indra/newview/skins/gemini/colors_base.xml
		Keep unbranding.
	linden/indra/newview/skins/gemini/textures/icon_top_pick.tga
	linden/indra/newview/viewer_manifest.py
		Manually merged boost, gstreamer, OTR, and name.
	linden/indra/newview/viewerinfo.cpp
		Manually merge the comment.

1 files changed, 0 insertions, 3 deletions

diff --git a/linden/indra/newview/panelradar.cpp b/linden/indra/newview/panelradar.cpp
index c94c0d1..ad6efc2 100644
--- a/linden/indra/newview/panelradar.cpp
+++ b/linden/indra/newview/panelradar.cpp
@@ -408,7 +408,6 @@ void PanelRadar::updateButtonStates()
         static bool enable_unmute = false;
         static bool enable_track = false;
         static bool enable_estate = false;
-        static bool enable_friend = false;
         static bool enable_cam = false;
 
         if (mRadarTabs->getCurrentPanelIndex() == 0) // Avatar tab
@@ -426,7 +425,6 @@ void PanelRadar::updateButtonStates()
                 enable_estate = isKickable(mSelectedAvatar);
                 enable_unmute = LLMuteList::getInstance()->isMuted(mSelectedAvatar);
                 enable_track = gAgent.isGodlike() || is_agent_mappable(mSelectedAvatar);
-                enable_friend = !is_agent_friend(mSelectedAvatar);
                 enable_cam = mSelectedDistance >= 0 && mSelectedDistance <= gSavedSettings.getF32("NearMeRange");
         }
         else
@@ -436,7 +434,6 @@ void PanelRadar::updateButtonStates()
                 enable_estate = false;
                 enable_unmute = false;
                 enable_track = false;
-                enable_friend = false;
                 enable_cam = false;
         }