summaryrefslogtreecommitdiff
path: root/indra/newview/lllocationinputctrl.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-11-04 11:54:08 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-11-04 11:54:08 -0500
commit72097affb53b8c8aa28e029eba0033630bca41b0 (patch)
tree3e65037b802d0ff63d9d394582211748cf21c753 /indra/newview/lllocationinputctrl.cpp
parent8188a8c410807debd2d7d40d0299c36b92e56ca3 (diff)
parent49956093db3ada36c04d01b905883067301a449a (diff)
merge
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
-rwxr-xr-xindra/newview/lllocationinputctrl.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 5022dba934..0d5ecc4059 100755
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -107,8 +107,8 @@ public:
private:
/*virtual*/ void done()
{
- uuid_vec_t::const_iterator it = mAdded.begin(), end = mAdded.end();
- for(; it != end; ++it)
+ const uuid_set_t& added = gInventory.getAddedIDs();
+ for (uuid_set_t::const_iterator it = added.begin(); it != added.end(); ++it)
{
LLInventoryItem* item = gInventory.getItem(*it);
if (!item || item->getType() != LLAssetType::AT_LANDMARK)
@@ -124,8 +124,6 @@ private:
mInput->onLandmarkLoaded(lm);
}
}
-
- mAdded.clear();
}
LLLocationInputCtrl* mInput;