diff options
| author | James Cook <james@lindenlab.com> | 2009-07-15 20:20:30 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-07-15 20:20:30 +0000 |
| commit | 408bed3d6b01d654d460b9ee0d929370194d8f9a (patch) | |
| tree | b34fb6995d9400c3fd67d41f1a8cfcf292d40ce6 | |
| parent | 5354caa13626ef4d5efa67c27c91265892ffd996 (diff) | |
Revert rev 126736 for DEV-35109 which made location history in nav bar show all teleports instead of only those typed. viewer-2 now meets current spec, but spec is under discussion and Product Engine may be asked to reimplement something different.
Merging revisions 126736-126735 of svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 into D:\viewer-2.0.0-3, respecting ancestry
| -rw-r--r-- | indra/newview/lllocationhistory.cpp | 18 | ||||
| -rw-r--r-- | indra/newview/llnavigationbar.cpp | 3 |
2 files changed, 3 insertions, 18 deletions
diff --git a/indra/newview/lllocationhistory.cpp b/indra/newview/lllocationhistory.cpp index 9ab57a9d76..179eca2532 100644 --- a/indra/newview/lllocationhistory.cpp +++ b/indra/newview/lllocationhistory.cpp @@ -37,29 +37,11 @@ #include <iomanip> // for std::setw() #include "llui.h" -#include "llagent.h" -#include "llslurl.h" -#include "llviewerregion.h" -#include "llviewerparcelmgr.h" - -void addLocationHistory() -{ - LLVector3 position = gAgent.getPositionAgent(); - std::string region_name = gAgent.getRegion()->getName(); - std::string location = LLSLURL::buildSLURL(region_name, - (S32)(position.mV[VX]), - (S32)(position.mV[VY]), - (S32)(position.mV[VZ]) ); - LLLocationHistory* lh = LLLocationHistory::getInstance(); - lh->addItem(location); - lh->save(); -} LLLocationHistory::LLLocationHistory() : mFilename("typed_locations.txt"), mLoadedCallback(NULL) { - LLViewerParcelMgr::getInstance()->setTeleportFinishedCallback(addLocationHistory); } void LLLocationHistory::addItem(std::string item) diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index df43b069c8..b4a6e63de8 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -415,7 +415,10 @@ void LLNavigationBar::onRegionNameResponse( S32 selected_item = mCmbLocation->getCurrentIndex(); if (selected_item == -1) // user has typed text { + LLLocationHistory* lh = LLLocationHistory::getInstance(); mCmbLocation->add(typed_location); + lh->addItem(typed_location); + lh->save(); } // Teleport to the location. |