diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2012-07-04 21:13:25 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2012-07-04 21:13:25 +0300 |
| commit | 1fa326ccdbb9b99fedac0b4cdab232ec1fbe8d74 (patch) | |
| tree | cdc8cf0c6bd37a9a9552dec3302b7c80565ed134 | |
| parent | e0eeed2680a2c6ba1055ac2a9f6465cb8004b7d6 (diff) | |
CHUI-136 ADDITIONAL FIX (Implement new design for blocked list on the people floater)
- Disabled object profile functionality according to the spec
| -rw-r--r-- | indra/newview/llblocklist.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/llblocklist.cpp b/indra/newview/llblocklist.cpp index 0165a9c4e8..066cb71677 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; } |