diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 19:10:43 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 19:10:43 -0800 |
| commit | c2ca71322bf48653d466cba40bbe01c3401318c7 (patch) | |
| tree | ecb9834f475c55dcf78c06aed115db69276068ef /indra/newview/llfloaterworldmap.cpp | |
| parent | a0de48f0ccf7ab8181651646036a13f712641b54 (diff) | |
| parent | 433eb89473e9aaa3864299b7ba50a320f14bba38 (diff) | |
automated merge
Don't wanna fix all windows EOL issue here
warn-on-failure:unix-eol
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
| -rw-r--r-- | indra/newview/llfloaterworldmap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 49416fff1c..bd6d8972e4 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -47,7 +47,7 @@ #include "llviewercontrol.h" #include "llcommandhandler.h" #include "lldraghandle.h" -#include "llfirstuse.h" +//#include "llfirstuse.h" #include "llfloaterreg.h" // getTypedInstance() #include "llfocusmgr.h" #include "llinventorymodel.h" @@ -314,7 +314,7 @@ void LLFloaterWorldMap::onOpen(const LLSD& key) adjustZoomSliderBounds(); // Could be first show - LLFirstUse::useMap(); + //LLFirstUse::useMap(); // Start speculative download of landmarks const LLUUID landmark_folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK); |