From e40d5de9d333b51e21f75a3636e340ad3947c43b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 9 Sep 2009 22:51:20 -0700
Subject: Admin options now only show for other people's profiles

---
 linden/indra/newview/llpanelavatar.cpp | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 8de2475..682a56f 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1432,6 +1432,14 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
 			childSetEnabled("Add Friend...",FALSE);
 			childSetVisible("Pay...",FALSE);
 			childSetEnabled("Pay...",FALSE);
+			childSetVisible("Kick",FALSE);
+			childSetEnabled("Kick",FALSE);
+			childSetVisible("Freeze",FALSE);
+			childSetEnabled("Freeze",FALSE);
+			childSetVisible("Unfreeze",FALSE);
+			childSetEnabled("Unfreeze",FALSE);
+			childSetVisible("csr_btn", FALSE);
+			childSetEnabled("csr_btn", FALSE);
 		}
 		else
 		{
@@ -1471,20 +1479,20 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
 			childSetEnabled("Add Friend...", !avatar_is_friend);
 			childSetVisible("Pay...",TRUE);
 			childSetEnabled("Pay...",FALSE);
+
+			BOOL is_god = FALSE;
+			if (gAgent.isGodlike()) is_god = TRUE;
+			
+			childSetVisible("Kick", is_god);
+			childSetEnabled("Kick", is_god);
+			childSetVisible("Freeze", is_god);
+			childSetEnabled("Freeze", is_god);
+			childSetVisible("Unfreeze", is_god);
+			childSetEnabled("Unfreeze", is_god);
+			childSetVisible("csr_btn", is_god);
+			childSetEnabled("csr_btn", is_god);
 		}
 	}
-	
-	BOOL is_god = FALSE;
-	if (gAgent.isGodlike()) is_god = TRUE;
-	
-	childSetVisible("Kick", is_god);
-	childSetEnabled("Kick", is_god);
-	childSetVisible("Freeze", is_god);
-	childSetEnabled("Freeze", is_god);
-	childSetVisible("Unfreeze", is_god);
-	childSetEnabled("Unfreeze", is_god);
-	childSetVisible("csr_btn", is_god);
-	childSetEnabled("csr_btn", is_god);
 }
 
 
-- 
cgit v1.1