diff options
| author | richard <none@none> | 2010-01-06 13:37:30 -0800 |
|---|---|---|
| committer | richard <none@none> | 2010-01-06 13:37:30 -0800 |
| commit | 97427f2a8d99e25520cf5b59310c0b67407b34a3 (patch) | |
| tree | f7f26a6b2ac6a7f2aea233c64ed2f9a1ff3fd8b7 /indra/newview/llfloaterworldmap.h | |
| parent | 49a744b676871db094d1608819a90fec02a6732d (diff) | |
| parent | a1e342b3f711c7ea23ac60b016c8b4024bf18a4a (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterworldmap.h')
| -rw-r--r-- | indra/newview/llfloaterworldmap.h | 5 |
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; |