diff options
| author | James Cook <james@lindenlab.com> | 2009-11-23 14:23:51 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-23 14:23:51 -0800 |
| commit | 347562844dc2be598f39138a39eaacaff6b4e323 (patch) | |
| tree | 1e3a084cdbd86efa3c757311cd500c4dca0e28de /indra/newview/llteleporthistory.cpp | |
| parent | 83237f875cb26d9f72055a5d47cdb928b30c0dc6 (diff) | |
Initial implementation of parcel property icons and maturity string on nav bar
Added new LLAgentUI location format, renamed unclear old one
Renamed ShowCoordinatesOption to NavBarShowCoordinates
Extended LLLocationInputCtrl to show icons.
Reviewed with Rick
Diffstat (limited to 'indra/newview/llteleporthistory.cpp')
| -rw-r--r-- | indra/newview/llteleporthistory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llteleporthistory.cpp b/indra/newview/llteleporthistory.cpp index bc886d5743..cc4689062e 100644 --- a/indra/newview/llteleporthistory.cpp +++ b/indra/newview/llteleporthistory.cpp @@ -52,7 +52,7 @@ const std::string& LLTeleportHistoryItem::getTitle() const { - return gSavedSettings.getBOOL("ShowCoordinatesOption") ? mFullTitle : mTitle; + return gSavedSettings.getBOOL("NavBarShowCoordinates") ? mFullTitle : mTitle; } ////////////////////////////////////////////////////////////////////////////// @@ -177,7 +177,7 @@ void LLTeleportHistory::purgeItems() std::string LLTeleportHistory::getCurrentLocationTitle(bool full, const LLVector3& local_pos_override) { std::string location_name; - LLAgentUI::ELocationFormat fmt = full ? LLAgentUI::LOCATION_FORMAT_WITHOUT_SIM : LLAgentUI::LOCATION_FORMAT_NORMAL; + LLAgentUI::ELocationFormat fmt = full ? LLAgentUI::LOCATION_FORMAT_NO_MATURITY : LLAgentUI::LOCATION_FORMAT_NORMAL; if (!LLAgentUI::buildLocationString(location_name, fmt, local_pos_override)) location_name = "Unknown"; return location_name; |