diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-24 12:10:10 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-24 12:10:10 -0500 |
| commit | a22bb00530bb779d8e5bb40b68e55767604d88dc (patch) | |
| tree | 520019b0c1e8c9cf475d19a60a0322a3c1caea6e /indra/newview/llnavigationbar.h | |
| parent | 0904cbe4846192c9897267c9a60175f84881f9ed (diff) | |
| parent | 76be5ddc7022508e7d3fcb04165b4a6f64f1d58d (diff) | |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llnavigationbar.h')
| -rw-r--r-- | indra/newview/llnavigationbar.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h index 52f5a827e4..cd3ba08db3 100644 --- a/indra/newview/llnavigationbar.h +++ b/indra/newview/llnavigationbar.h @@ -81,7 +81,8 @@ private: void onLocationSelection(); void onLocationPrearrange(const LLSD& data); void onSearchCommit(); - void onTeleportFinished(const LLVector3d& global_agent_pos, const std::string& typed_location); + void onTeleportFinished(const LLVector3d& global_agent_pos); + void onTeleportFailed(); void onRegionNameResponse( std::string typed_location, std::string region_name, @@ -99,8 +100,11 @@ private: LLLocationInputCtrl* mCmbLocation; LLRect mDefaultNbRect; LLRect mDefaultFpRect; + boost::signals2::connection mTeleportFailedConnection; boost::signals2::connection mTeleportFinishConnection; bool mPurgeTPHistoryItems; + // if true, save location to location history when teleport finishes + bool mSaveToLocationHistory; }; #endif |