diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-26 20:47:27 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-26 20:47:27 +0000 |
| commit | af98aad98d43ec8b128ecac3089426d6ae6edc3f (patch) | |
| tree | 5971f87afc04580df470a003793dcc8c974e29a7 /indra/newview/llnavigationbar.h | |
| parent | 6a364e6f32c12c1ab2c0f33e8ef07d885a8765a2 (diff) | |
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3
EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
Diffstat (limited to 'indra/newview/llnavigationbar.h')
| -rw-r--r-- | indra/newview/llnavigationbar.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h index eeaec4e668..6932847854 100644 --- a/indra/newview/llnavigationbar.h +++ b/indra/newview/llnavigationbar.h @@ -70,8 +70,10 @@ private: void showTeleportHistoryMenu(); void invokeSearch(std::string search_text); - static void appendLocalCoordsToRegName(std::string* reg_name, S32 x, S32 y, S32 z); - static std::string extractLocalCoordsFromRegName(const std::string & reg_name, S32* x, S32* y, S32* z); + /** + * Get region name and local coordinates from typed location + */ + static std::string parseLocation(const std::string & location, S32* x, S32* y, S32* z); // callbacks void onTeleportHistoryMenuItemClicked(const LLSD& userdata); @@ -84,7 +86,7 @@ private: void onLocationSelection(); void onLocationPrearrange(const LLSD& data); void onSearchCommit(); - void onTeleportFinished(); + void onTeleportFinished(const LLVector3d& global_agent_pos); void onRegionNameResponse( std::string typed_location, std::string region_name, @@ -104,7 +106,6 @@ private: LLRect mDefaultFpRect; boost::signals2::connection mParcelMgrConnection; bool mPurgeTPHistoryItems; - bool mUpdateTypedLocationHistory; }; #endif |