From 1fa326ccdbb9b99fedac0b4cdab232ec1fbe8d74 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Wed, 4 Jul 2012 21:13:25 +0300
Subject: [PATCH] CHUI-136 ADDITIONAL FIX (Implement new design for blocked
list on the people floater)
- Disabled object profile functionality according to the spec
---
indra/newview/llblocklist.cpp | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llblocklist.cpp b/indra/newview/llblocklist.cpp
index 0165a9c4e88..066cb71677a 100644
--- a/indra/newview/llblocklist.cpp
+++ b/indra/newview/llblocklist.cpp
@@ -195,7 +195,13 @@ bool LLBlockList::isActionEnabled(const LLSD& userdata)
const std::string command_name = userdata.asString();
- if ("unblock_item" == command_name || "profile_item" == command_name)
+ if ("profile_item" == command_name)
+ {
+ LLBlockedListItem* item = getBlockedItem();
+ action_enabled = item && (LLMute::AGENT == item->getType());
+ }
+
+ if ("unblock_item" == command_name)
{
action_enabled = getSelectedItem() != NULL;
}
@@ -227,10 +233,6 @@ void LLBlockList::onCustomAction(const LLSD& userdata)
LLAvatarActions::showProfile(item->getUUID());
break;
- case LLMute::OBJECT:
- LLFloaterSidePanelContainer::showPanel("inventory", LLSD().with("id", item->getUUID()));
- break;
-
default:
break;
}
--
GitLab