diff options
| author | Don Kjer <don@lindenlab.com> | 2007-10-11 00:28:42 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-10-11 00:28:42 +0000 |
| commit | 1b550aaec246063090fe7143145d69eebfbd4680 (patch) | |
| tree | 66b1d7c9f424e0183c5488037fcdae3a37916955 /indra/newview/llfloaterworldmap.cpp | |
| parent | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (diff) | |
EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release
ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
| -rw-r--r-- | indra/newview/llfloaterworldmap.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 23d01a963b..bdb7f09e22 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -298,20 +298,6 @@ void LLFloaterWorldMap::onClose(bool app_quitting) setVisible(FALSE); } -// Allow us to download landmarks quickly when map is shown -class LLLandmarkFetchDescendentsObserver : public LLInventoryFetchDescendentsObserver -{ -public: - virtual void done() - { - // We need to find landmarks in all folders, so get the main - // background download going. - gInventory.startBackgroundFetch(); - gInventory.removeObserver(this); - delete this; - } -}; - // static void LLFloaterWorldMap::show(void*, BOOL center_on_target) { @@ -351,7 +337,6 @@ void LLFloaterWorldMap::show(void*, BOOL center_on_target) LLFirstUse::useMap(); // Start speculative download of landmarks - LLInventoryFetchDescendentsObserver::folder_ref_t folders; LLUUID landmark_folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK); gInventory.startBackgroundFetch(landmark_folder_id); |