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/llagentui.h | |
parent | 76be5ddc7022508e7d3fcb04165b4a6f64f1d58d (diff) | |
parent | 0b3f6b3e9a1414c11ccf6011930c2eec6cf2fdd7 (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llagentui.h')
-rw-r--r-- | indra/newview/llagentui.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llagentui.h b/indra/newview/llagentui.h index c7aafb71e7..3478793e38 100644 --- a/indra/newview/llagentui.h +++ b/indra/newview/llagentui.h @@ -38,10 +38,11 @@ class LLAgentUI public: enum ELocationFormat { - LOCATION_FORMAT_NORMAL, - LOCATION_FORMAT_LANDMARK, - LOCATION_FORMAT_WITHOUT_SIM, - LOCATION_FORMAT_FULL, + LOCATION_FORMAT_NORMAL, // Parcel + LOCATION_FORMAT_LANDMARK, // Parcel, Region + LOCATION_FORMAT_NO_MATURITY, // Parcel, Region (x, y, z) + LOCATION_FORMAT_NO_COORDS, // Parcel, Region - Maturity + LOCATION_FORMAT_FULL, // Parcel, Region (x, y, z) - Maturity }; static void buildName(std::string& name); |