diff options
| -rw-r--r-- | doc/contributions.txt | 3 | ||||
| -rw-r--r-- | indra/newview/llsidepaneliteminfo.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llsidepaneliteminfo.h | 1 | 
3 files changed, 11 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 67683204e2..780fa0e3c8 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -372,6 +372,7 @@ Khyota Wulluf  	VWR-9966  Kitty Barnett  	VWR-19699 +	STORM-288  Kunnis Basiat  	VWR-82  	VWR-102 @@ -774,10 +775,12 @@ WolfPup Lowenhar  	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 --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp index be797ea937..c8c6858b81 100644 --- a/indra/newview/llsidepaneliteminfo.cpp +++ b/indra/newview/llsidepaneliteminfo.cpp @@ -71,12 +71,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) @@ -196,6 +196,11 @@ const LLUUID& LLSidepanelItemInfo::getObjectID() const  	return mObjectID;  } +const LLUUID& LLSidepanelItemInfo::getItemID() const +{ +	return mItemID; +} +  void LLSidepanelItemInfo::reset()  {  	LLSidepanelInventorySubpanel::reset(); diff --git a/indra/newview/llsidepaneliteminfo.h b/indra/newview/llsidepaneliteminfo.h index 6416e2cfe4..25be145f64 100644 --- a/indra/newview/llsidepaneliteminfo.h +++ b/indra/newview/llsidepaneliteminfo.h @@ -55,6 +55,7 @@ public:  	void setEditMode(BOOL edit);  	const LLUUID& getObjectID() const; +	const LLUUID& getItemID() const;  protected:  	/*virtual*/ void refresh();  | 
