Skip to content
Snippets Groups Projects
Commit bd53ba00 authored by Wolfpup Lowenhar's avatar Wolfpup Lowenhar
Browse files

STORM-776 : unable to change permissions to "no trans" on item in avatar inventory

   applied Kitty's code changes listed in STROM-288 as it is a related issue and this
   actualy fixed both issues!
parent 2027ce56
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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();
......
......@@ -55,6 +55,7 @@ class LLSidepanelItemInfo : public LLSidepanelInventorySubpanel
void setEditMode(BOOL edit);
const LLUUID& getObjectID() const;
const LLUUID& getItemID() const;
protected:
/*virtual*/ void refresh();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment