diff -r b0689af42a71 doc/contributions.txt --- a/doc/contributions.txt Tue Dec 14 14:47:44 2010 -0500 +++ b/doc/contributions.txt Wed Dec 15 09:35:02 2010 -0500 @@ -372,6 +372,7 @@ VWR-9966 Kitty Barnett VWR-19699 + STORM-288 Kunnis Basiat VWR-82 VWR-102 @@ -774,10 +775,12 @@ STORM-143 STORM-255 STORM-256 + STORM-288 STORM-535 STORM-544 STORM-654 STORM-674 + STORM-776 VWR-20741 VWR-20933 Zai Lynch diff -r b0689af42a71 indra/newview/llsidepaneliteminfo.h --- a/indra/newview/llsidepaneliteminfo.h Tue Dec 14 14:47:44 2010 -0500 +++ b/indra/newview/llsidepaneliteminfo.h Wed Dec 15 09:35:02 2010 -0500 @@ -55,6 +55,7 @@ void setEditMode(BOOL edit); const LLUUID& getObjectID() const; + const LLUUID& getItemID() const; protected: /*virtual*/ void refresh(); diff -r b0689af42a71 indra/newview/llsidepaneliteminfo.cpp --- a/indra/newview/llsidepaneliteminfo.cpp Tue Dec 14 14:47:44 2010 -0500 +++ b/indra/newview/llsidepaneliteminfo.cpp Wed Dec 15 09:35:02 2010 -0500 @@ -71,12 +71,12 @@ const std::set& mChangedItemIDs = gInventory.getChangedIDs(); std::set::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) @@ -196,6 +196,11 @@ return mObjectID; } +const LLUUID& LLSidepanelItemInfo::getItemID() const +{ + return mItemID; +} + void LLSidepanelItemInfo::reset() { LLSidepanelInventorySubpanel::reset();