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

Backported from Viewer-Dev (14104 (b9f75db99fce) STORM-776 : unable to change permissions to "no trans" on item in avatar inventory...)

meow-7.2.2
Tank_Master 2011-02-10 09:20:14 -08:00
parent 3958caac6e
commit 4c7ff3b492
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llsidepaneliteminfo.cpp
View File

@ -73,12 +73,12 @@ void LLItemPropertiesObserver::changed(U32 mask)
const std::set<LLUUID>& mChangedItemIDs = gInventory.getChangedIDs();
std::set<LLUUID>::const_iterator it;
const LLUUID& object_id = mFloater->getObjectID();
const LLUUID& item_id = mFloater->getItemID();
for (it = mChangedItemIDs.begin(); it != mChangedItemIDs.end(); it++)
{
// set dirty for 'item profile panel' only if changed item is the item for which 'item profile panel' is shown (STORM-288)
if (*it == object_id)
if (*it == item_id)
{
// if there's a change we're interested in.
if((mask & (LLInventoryObserver::LABEL | LLInventoryObserver::INTERNAL | LLInventoryObserver::REMOVE)) != 0)
@ -198,6 +198,10 @@ const LLUUID& LLSidepanelItemInfo::getObjectID() const
return mObjectID;
}
const LLUUID& LLSidepanelItemInfo::getItemID() const
{
return mItemID;
}
void LLSidepanelItemInfo::reset()
{
LLSidepanelInventorySubpanel::reset();

1
indra/newview/llsidepaneliteminfo.h
View File

@ -55,6 +55,7 @@ public:
void setEditMode(BOOL edit);
const LLUUID& getObjectID() const;
const LLUUID& getItemID() const;
protected:
/*virtual*/ void refresh();