diff options
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 |