diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-06-17 13:09:15 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-06-17 13:09:15 -0700 |
| commit | 299921de323eb9b6844cd7b6f6b8da3490ee3747 (patch) | |
| tree | dcb4c5c257622c20014a0b986dc8e2d1c25a10c7 /indra/newview/lllocationinputctrl.cpp | |
| parent | 89ea1cbc7acee8878c36a5795dd3df12a913c513 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
Merge with 3.7.9-release
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
| -rwxr-xr-x | indra/newview/lllocationinputctrl.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index af194aaa1d..8d21fda8f9 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; @@ -142,7 +140,11 @@ public: private: /*virtual*/ void changed(U32 mask) { - if (mask & (~(LLInventoryObserver::LABEL|LLInventoryObserver::INTERNAL|LLInventoryObserver::ADD))) + if (mask & (~(LLInventoryObserver::LABEL| + LLInventoryObserver::INTERNAL| + LLInventoryObserver::ADD| + LLInventoryObserver::CREATE| + LLInventoryObserver::UPDATE_CREATE))) { mInput->updateAddLandmarkButton(); } |