diff options
| author | simon@lindenlab.com <simon@lindenlab.com> | 2011-06-16 13:15:30 -0700 |
|---|---|---|
| committer | simon@lindenlab.com <simon@lindenlab.com> | 2011-06-16 13:15:30 -0700 |
| commit | 9a02a4a1ea9634e96222cf79599d853dbef33268 (patch) | |
| tree | abac88978fade4a8f0998272a1cf5c30e6431769 /indra/newview/lllocationinputctrl.h | |
| parent | f0694e45c8d140bd93abe097ec8e8cc99630ed39 (diff) | |
| parent | 50393788693578a2fe3a934faa04b382d75f1657 (diff) | |
Merge with latest lindenlab/viewer-development
Diffstat (limited to 'indra/newview/lllocationinputctrl.h')
| -rw-r--r-- | indra/newview/lllocationinputctrl.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h index 6368bf5cf2..ead20efcb6 100644 --- a/indra/newview/lllocationinputctrl.h +++ b/indra/newview/lllocationinputctrl.h @@ -77,7 +77,8 @@ public: push_icon, build_icon, scripts_icon, - damage_icon; + damage_icon, + hidden_av_icon; Optional<LLTextBox::Params> damage_text; Params(); }; @@ -109,12 +110,13 @@ private: enum EParcelIcon { VOICE_ICON = 0, - FLY_ICON, - PUSH_ICON, - BUILD_ICON, - SCRIPTS_ICON, - DAMAGE_ICON, - ICON_COUNT + FLY_ICON, // 1 + PUSH_ICON, // 2 + BUILD_ICON, // 3 + SCRIPTS_ICON, // 4 + DAMAGE_ICON, // 5 + HIDDEN_AV_ICON, // 6 + ICON_COUNT // 7 total }; friend class LLUICtrlFactory; |