summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterworldmap.h
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-01-04 16:27:30 -0800
committerJames Cook <james@lindenlab.com>2010-01-04 16:27:30 -0800
commitad6ff3a44c649779037182266b14649607c79fa4 (patch)
tree909684972b9e45794b846abf8cf1ab351a6c5335 /indra/newview/llfloaterworldmap.h
parent1355d16d2f24f9d623df70059b1f0001cf673209 (diff)
EXT-3840 Default map position is back to 128, 128, 0, removed dead
code supporting X/Y/Z position spinners. Reviewed with Leyla
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;