diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 22:30:09 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 22:30:09 +0000 |
| commit | 51500f82e23b7deff9a0e1bc23f5bfa40aec1fb9 (patch) | |
| tree | 2ed65f1dd0a8404eda670cf1fe2e37769758f74a /indra/newview/llteleporthistory.h | |
| parent | b2b980d6979b10a08b56c10b71c12ae4f9e6ff59 (diff) | |
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3
* EXT-97 EXT-576 EXT-593 EXT-613 EXT-649 EXT-697 EXT-707 EXT-708 EXT-726 EXT-737
Diffstat (limited to 'indra/newview/llteleporthistory.h')
| -rw-r--r-- | indra/newview/llteleporthistory.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/indra/newview/llteleporthistory.h b/indra/newview/llteleporthistory.h index 060534635d..9f5563ed0b 100644 --- a/indra/newview/llteleporthistory.h +++ b/indra/newview/llteleporthistory.h @@ -55,11 +55,14 @@ public: LLTeleportHistoryItem(std::string title, LLVector3d global_pos) : mTitle(title), mGlobalPos(global_pos) {} - - LLTeleportHistoryItem(const LLSD& val); - LLSD toLLSD() const; + /** + * @return title formatted according to the current value of the ShowCoordinatesOption setting. + */ + const std::string& getTitle() const; + std::string mTitle; // human-readable location title + std::string mFullTitle; // human-readable location title including coordinates LLVector3d mGlobalPos; // global position LLUUID mRegionID; // region ID for getting the region info }; @@ -168,8 +171,15 @@ private: * Invokes the "history changed" callback(s). */ void onHistoryChanged(); - - static std::string getCurrentLocationTitle(); + + /** + * Format current agent location in a human-readable manner. + * + * @param full whether to include coordinates + * @param local_pos_override hack: see description of updateCurrentLocation() + * @return + */ + static std::string getCurrentLocationTitle(bool full, const LLVector3& local_pos_override); /** * Actually, the teleport history. |