diff options
author | Cho <cho@lindenlab.com> | 2014-06-06 00:14:14 +0100 |
---|---|---|
committer | Cho <cho@lindenlab.com> | 2014-06-06 00:14:14 +0100 |
commit | 961418a42c10527f1dca4ec05d943d6f1772cd82 (patch) | |
tree | f0330a37eb76007a6aac4a9b6406def7c53d6eb5 /indra | |
parent | c4905b76ed41ec3a4c5f75d33bdc4915958bfabd (diff) |
Fixed ACME-1502
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llpanelexperiencelisteditor.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/newview/llpanelexperiencelisteditor.cpp b/indra/newview/llpanelexperiencelisteditor.cpp index 6641483054..cc44b7a339 100644 --- a/indra/newview/llpanelexperiencelisteditor.cpp +++ b/indra/newview/llpanelexperiencelisteditor.cpp @@ -76,8 +76,10 @@ const uuid_list_t& LLPanelExperienceListEditor::getExperienceIds() const void LLPanelExperienceListEditor::addExperienceIds( const uuid_vec_t& experience_ids ) { - mExperienceIds.insert(experience_ids.begin(), experience_ids.end()); - onItems(); + // the commented out code in this function is handled by the callback and no longer necessary! + + //mExperienceIds.insert(experience_ids.begin(), experience_ids.end()); + //onItems(); if(!mAddedCallback.empty()) { for(uuid_vec_t::const_iterator it = experience_ids.begin(); it != experience_ids.end(); ++it) @@ -118,17 +120,19 @@ void LLPanelExperienceListEditor::onAdd() void LLPanelExperienceListEditor::onRemove() { + // the commented out code in this function is handled by the callback and no longer necessary! + std::vector<LLScrollListItem*> items= mItems->getAllSelected(); std::vector<LLScrollListItem*>::iterator it = items.begin(); for(/**/; it != items.end(); ++it) { if((*it) != NULL) { - mExperienceIds.erase((*it)->getValue()); + //mExperienceIds.erase((*it)->getValue()); mRemovedCallback((*it)->getValue()); } } - onItems(); + //onItems(); } void LLPanelExperienceListEditor::onProfile() |