livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-136 ADDITIONAL FIX (Implement new design for blocked list on the people floater) 

- Disabled object profile functionality according to the spec
master
Paul ProductEngine 2012-07-04 21:13:25 +03:00
parent e0eeed2680
commit 1fa326ccdb
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llblocklist.cpp
View File

@ -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;
}