diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-11-12 14:06:38 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-11-12 14:06:38 -0500 |
| commit | d191585a3eec778e36e5f0c4b620c3d525c86c42 (patch) | |
| tree | 2612c0d1947e00d9ceba82b054a7a90113ffa752 /indra/newview/llagentui.h | |
| parent | ac1d3a22f2034a5e3aba757bde72825643fa799c (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
Merge. Refresh from viewer-release after 3.6.10 release
Diffstat (limited to 'indra/newview/llagentui.h')
| -rwxr-xr-x | indra/newview/llagentui.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llagentui.h b/indra/newview/llagentui.h index dda5dc1fd1..bb48dad14c 100755 --- a/indra/newview/llagentui.h +++ b/indra/newview/llagentui.h @@ -35,6 +35,7 @@ public: enum ELocationFormat { LOCATION_FORMAT_NORMAL, // Parcel + LOCATION_FORMAT_NORMAL_COORDS, // Parcel (x, y, z) LOCATION_FORMAT_LANDMARK, // Parcel, Region LOCATION_FORMAT_NO_MATURITY, // Parcel, Region (x, y, z) LOCATION_FORMAT_NO_COORDS, // Parcel, Region - Maturity |