Show disabled buttons for own profile rather than hiding them

2 files changed, 41 insertions, 22 deletions

diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index e101ea2..5fed44c 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1318,14 +1318,6 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
 
         mPanelSecondLife->childSetVisible("online_yes", (online_status == ONLINE_STATUS_YES));
 
-        // Since setOnlineStatus gets called after setAvatarID
-        // need to make sure that "Offer Teleport" doesn't get set
-        // to TRUE again for yourself
-        if (mAvatarID != gAgent.getID())
-        {
-                childSetVisible("Offer Teleport...",TRUE);
-        }
-
         BOOL in_prelude = gAgent.inPrelude();
         if(gAgent.isGodlike())
         {
@@ -1342,6 +1334,18 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
                 childSetEnabled("Offer Teleport...", TRUE);
                 childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString());
         }
+
+        // Since setOnlineStatus gets called after setAvatarID
+        // need to make sure that "Offer Teleport" doesn't get set
+        // to TRUE again for yourself
+        if (mAvatarID != gAgent.getID())
+        {
+                childSetVisible("Offer Teleport...",TRUE);
+        }
+        else
+        {
+                childSetEnabled("Offer Teleport...", FALSE);
+        }
 }
 
 void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name,
@@ -1434,21 +1438,21 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
                                 childSetVisible("Cancel",FALSE);
                                 childSetEnabled("Cancel",FALSE);
                         }
-                        childSetVisible("Instant Message...",FALSE);
+                        //childSetVisible("Instant Message...",FALSE);
                         childSetEnabled("Instant Message...",FALSE);
-                        childSetVisible("Invite to Group...",FALSE);
+                        //childSetVisible("Invite to Group...",FALSE);
                         childSetEnabled("Invite to Group...",FALSE);
-                        childSetVisible("Mute",FALSE);
+                        //childSetVisible("Mute",FALSE);
                         childSetEnabled("Mute",FALSE);
-                        childSetVisible("Offer Teleport...",FALSE);
+                        //childSetVisible("Offer Teleport...",FALSE);
                         childSetEnabled("Offer Teleport...",FALSE);
-                        childSetVisible("drop target",FALSE);
+                        //childSetVisible("drop target",FALSE);
                         childSetEnabled("drop target",FALSE);
-                        childSetVisible("Find on Map",FALSE);
+                        //childSetVisible("Find on Map",FALSE);
                         childSetEnabled("Find on Map",FALSE);
-                        childSetVisible("Add Friend...",FALSE);
+                        //childSetVisible("Add Friend...",FALSE);
                         childSetEnabled("Add Friend...",FALSE);
-                        childSetVisible("Pay...",FALSE);
+                        //childSetVisible("Pay...",FALSE);
                         childSetEnabled("Pay...",FALSE);
                         childSetVisible("Kick",FALSE);
                         childSetEnabled("Kick",FALSE);
@@ -1819,12 +1823,27 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
                 {
                         continue;
                 }
-                self->childSetEnabled("Instant Message...",TRUE);
-                self->childSetEnabled("Invite to Group...",TRUE);
-                self->childSetEnabled("Pay...",TRUE);
-                self->childSetEnabled("Mute",TRUE);
 
-                self->childSetEnabled("drop target",TRUE);
+                if (self->mAvatarID == agent_id)
+                {
+                        self->childSetEnabled("Instant Message...",FALSE);
+                        self->childSetEnabled("Invite to Group...",FALSE);
+                        self->childSetEnabled("Pay...",FALSE);
+                        self->childSetEnabled("Mute",FALSE);
+
+                        self->childSetVisible("drop target",FALSE);
+                        self->childSetEnabled("drop target",FALSE);
+                }
+                else
+                {
+                        self->childSetEnabled("Instant Message...",TRUE);
+                        self->childSetEnabled("Invite to Group...",TRUE);
+                        self->childSetEnabled("Pay...",TRUE);
+                        self->childSetEnabled("Mute",TRUE);
+
+                        self->childSetVisible("drop target",TRUE);
+                        self->childSetEnabled("drop target",TRUE);
+                }
 
                 self->mHaveProperties = TRUE;
                 self->enableOKIfReady();
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 2ea8890..6bcd7a5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -148,7 +148,7 @@
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="40" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="center" height="16" right="-22"
-                             mouse_opaque="true" name="Give inventory"
+                             mouse_opaque="true" name="drop target"
                              tool_tip="Drop inventory items here to give them to this resident." v_pad="2"
                              width="115">
         Drop inventory here