diff options
author | James Cook <james@lindenlab.com> | 2009-11-24 08:47:13 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-11-24 08:47:13 -0800 |
commit | f9081220accfe5c197f1c567af8806bde236f946 (patch) | |
tree | e711a74a34aa309222d28f694f02345dde305c4d /indra/newview/llteleporthistory.h | |
parent | 76be5ddc7022508e7d3fcb04165b4a6f64f1d58d (diff) | |
parent | 0b3f6b3e9a1414c11ccf6011930c2eec6cf2fdd7 (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llteleporthistory.h')
-rw-r--r-- | indra/newview/llteleporthistory.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llteleporthistory.h b/indra/newview/llteleporthistory.h index 9f5563ed0b..a82bec7c4f 100644 --- a/indra/newview/llteleporthistory.h +++ b/indra/newview/llteleporthistory.h @@ -57,7 +57,8 @@ public: {} /** - * @return title formatted according to the current value of the ShowCoordinatesOption setting. + * @return title formatted according to the current value of the + * NavBarShowCoordinates setting. */ const std::string& getTitle() const; |