summaryrefslogtreecommitdiff
path: root/indra/newview/llcofwearables.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-07-06 15:49:32 -0400
committerLoren Shih <seraph@lindenlab.com>2010-07-06 15:49:32 -0400
commit419bfb16fdd9b79d32736fd80652685a07f9e39f (patch)
tree4afafc0665ca3b486e2507369d9d214d40abf9ac /indra/newview/llcofwearables.cpp
parentced040f8aef5a764c2e6fb261d5bbecd4df75064 (diff)
parent7de36b3d4217f5ceee8b46a59983229b7af35981 (diff)
automated merge
Diffstat (limited to 'indra/newview/llcofwearables.cpp')
-rw-r--r--indra/newview/llcofwearables.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llcofwearables.cpp b/indra/newview/llcofwearables.cpp
index 472d2ccf24..f278fb6a7b 100644
--- a/indra/newview/llcofwearables.cpp
+++ b/indra/newview/llcofwearables.cpp
@@ -372,6 +372,11 @@ void LLCOFWearables::refresh()
iter != iter_end; ++iter)
{
LLFlatListView* list = iter->first;
+ if (!list) continue;
+
+ //restoring selection should not fire commit callbacks
+ list->setCommitOnSelectionChange(false);
+
const values_vector_t& values = iter->second;
for (values_vector_t::const_iterator
value_it = values.begin(),
@@ -385,6 +390,8 @@ void LLCOFWearables::refresh()
list->selectItemByValue(*value_it);
}
}
+
+ list->setCommitOnSelectionChange(true);
}
}