From 2b59f181bb8bf93e94aa6806a76719043fe3b4b0 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 22 Apr 2012 22:35:52 +0200 Subject: [PATCH] Fixed profile and estate kick button in top objects not working if display names are disabled --- indra/newview/llfloatertopobjects.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp index 5c8e1af680..89d4f2a899 100644 --- a/indra/newview/llfloatertopobjects.cpp +++ b/indra/newview/llfloatertopobjects.cpp @@ -53,6 +53,9 @@ #include "llavataractions.h" +// Name returned if object is not an avatar (with and without display names) +const std::string OBJECT_NOT_AVATAR_NAME = "(???) (???)"; + //LLFloaterTopObjects* LLFloaterTopObjects::sInstance = NULL; // Globals @@ -309,7 +312,7 @@ void LLFloaterTopObjects::updateSelectionInfo() LLAvatarName av_name; if (LLAvatarNameCache::get(object_id, &av_name)) { - bool isAvatar = !av_name.mIsTemporaryName; + bool isAvatar = (av_name.mDisplayName != OBJECT_NOT_AVATAR_NAME); getChild("profile_btn")->setEnabled(isAvatar); getChild("estate_kick_btn")->setEnabled(isAvatar); } @@ -591,7 +594,7 @@ void LLFloaterTopObjects::onAvatarCheck(const LLUUID& avatar_id, LLAvatarName av if (first_selected->getUUID() == avatar_id) { - bool isAvatar = !av_name.mIsTemporaryName; + bool isAvatar = (av_name.mDisplayName != OBJECT_NOT_AVATAR_NAME); getChild("profile_btn")->setEnabled(isAvatar); getChild("estate_kick_btn")->setEnabled(isAvatar); }