diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-26 15:41:49 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-26 15:41:49 -0400 |
| commit | ed701685f6d07da47a3a796bd79dfc4ae1860fcc (patch) | |
| tree | 244612881e0787e5f6f7be6a319aaad67fb09059 /indra/newview/lllocationinputctrl.h | |
| parent | c567f0dcdd1b31cc94e9065218a88d48cdaf2278 (diff) | |
| parent | c118ec209907618c77613990fe2359d4f92802e6 (diff) | |
merged .hgtags
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; |