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

STORM-1799 Object doesn't appear in Block list if trying to block from Remote object inspector

meow-7.2.2
Jonathan Yap 2012-01-16 12:16:17 -05:00
parent 3dfb1536fa
commit 1fc53d33bd
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -607,6 +607,7 @@ Jonathan Yap
STORM-1737
STORM-1733
STORM-1790
STORM-1799
Kadah Coba
STORM-1060
Jondan Lundquist

24
indra/newview/llinspectremoteobject.cpp
View File

@ -60,12 +60,10 @@ public:
private:
void update();
void onNameCache(const LLUUID& id, const std::string& name, bool is_group);
private:
LLUUID mObjectID;
LLUUID mOwnerID;
std::string mOwnerLegacyName;
std::string mSLurl;
std::string mName;
bool mGroupOwned;
@ -75,7 +73,6 @@ LLInspectRemoteObject::LLInspectRemoteObject(const LLSD& sd) :
LLInspect(LLSD()),
mObjectID(NULL),
mOwnerID(NULL),
mOwnerLegacyName(),
mSLurl(""),
mName(""),
mGroupOwned(false)
@ -111,14 +108,6 @@ void LLInspectRemoteObject::onOpen(const LLSD& data)
mGroupOwned = data["group_owned"].asBoolean();
mSLurl = data["slurl"].asString();
// work out the owner's name
mOwnerLegacyName = "";
if (gCacheName)
{
gCacheName->get(mOwnerID, mGroupOwned, // muting
boost::bind(&LLInspectRemoteObject::onNameCache, this, _1, _2, _3));
}
// update the inspector with the current object state
update();
@ -144,8 +133,7 @@ void LLInspectRemoteObject::onClickMap()
void LLInspectRemoteObject::onClickBlock()
{
LLMute::EType mute_type = mGroupOwned ? LLMute::GROUP : LLMute::AGENT;
LLMute mute(mOwnerID, mOwnerLegacyName, mute_type);
LLMute mute(mObjectID, mName, LLMute::OBJECT);
LLMuteList::getInstance()->add(mute);
LLPanelBlockedList::showPanelAndSelect(mute.mID);
closeFloater();
@ -156,12 +144,6 @@ void LLInspectRemoteObject::onClickClose()
closeFloater();
}
void LLInspectRemoteObject::onNameCache(const LLUUID& id, const std::string& name, bool is_group)
{
mOwnerLegacyName = name;
update();
}
void LLInspectRemoteObject::update()
{
// show the object name as the inspector's title
@ -198,8 +180,8 @@ void LLInspectRemoteObject::update()
// disable the Map button if we don't have a SLurl
getChild<LLUICtrl>("map_btn")->setEnabled(! mSLurl.empty());
// disable the Block button if we don't have the owner ID
getChild<LLUICtrl>("block_btn")->setEnabled(! mOwnerID.isNull());
// disable the Block button if we don't have the object ID (will this ever happen?)
getChild<LLUICtrl>("block_btn")->setEnabled(! mObjectID.isNull());
}
//////////////////////////////////////////////////////////////////////////////