summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterworldmap.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-07 09:40:27 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-07 09:40:27 -0800
commit29d67f0c690df1d24d4533327bc99f7a56148588 (patch)
treedc6fd659235ce6d3f0b9115750c6f708854bdd48 /indra/newview/llfloaterworldmap.h
parentae7324ea34492a084300497b5da7ac611ee911e8 (diff)
parentb7bab35cb58a33014bb05f2d77b03e58d9e90651 (diff)
Merge latest fixes from viewer2.
Diffstat (limited to 'indra/newview/llfloaterworldmap.h')
-rw-r--r--indra/newview/llfloaterworldmap.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h
index 7feebb583d..00f5e788fb 100644
--- a/indra/newview/llfloaterworldmap.h
+++ b/indra/newview/llfloaterworldmap.h
@@ -148,7 +148,6 @@ protected:
void updateSearchEnabled();
void onLocationFocusChanged( LLFocusableElement* ctrl );
void onLocationCommit();
- void onCommitLocation();
void onCommitSearchResult();
void cacheLandmarkPosition();
@@ -170,6 +169,10 @@ private:
LLFriendObserver* mFriendObserver;
std::string mCompletingRegionName;
+ // Local position from trackURL() request, used to select final
+ // position once region lookup complete.
+ LLVector3 mCompletingRegionPos;
+
std::string mLastRegionName;
BOOL mWaitingForTracker;