diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-08 22:10:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-08 22:10:07 -0400 |
| commit | 9ee4051df097d7a24efd46c26614fd69df5ed63f (patch) | |
| tree | 53868be5d3c3211a3941415ee2fdd36a05a4fd18 /indra/newview/lllocationinputctrl.h | |
| parent | 093fdcfcd3debd74dc773bf52faa07ea9f5f8b31 (diff) | |
| parent | bef014ad2ab9496755ef266cdfaeb9f9c333b240 (diff) | |
merge changes for storm-1491
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..ed47ba73e3 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, + see_avatars_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 + SEE_AVATARS_ICON, // 6 + ICON_COUNT // 7 total }; friend class LLUICtrlFactory; |