diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-24 22:11:24 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-24 22:11:24 -0500 |
| commit | ccf6cb3f9ba387117720d700b73ac8e05dbf1f75 (patch) | |
| tree | 71163fde19389893c8951ebb723ddf9379318518 /indra/newview/llagentui.h | |
| parent | 2369fa96c24bafbd032c85b58767502cfd37ebaf (diff) | |
| parent | 5b5354c933aa7b1ceeb307853c24fba28d4e31bf (diff) | |
viewer-2.0 automated merge
--HG--
branch : avatar-pipeline
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); |