diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-23 14:32:18 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-23 14:32:18 +0100 |
| commit | 607d67d152f77a0b3c09b3c37db2fa6f0d8a12cf (patch) | |
| tree | d451e76b7cd0563565b18bf5f21c6518e470bc81 /indra/newview/llavatarlistitem.h | |
| parent | c096e209abeb50d3de408dfe3d1b1cc14dfa6c80 (diff) | |
| parent | 7f0bcfae49169f1c76806cf857a920a6a2396bf9 (diff) | |
merge storm-206
Diffstat (limited to 'indra/newview/llavatarlistitem.h')
| -rw-r--r-- | indra/newview/llavatarlistitem.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h index ffb988b2ab..52187284eb 100644 --- a/indra/newview/llavatarlistitem.h +++ b/indra/newview/llavatarlistitem.h @@ -143,10 +143,10 @@ private: ALIC_SPEAKER_INDICATOR, ALIC_PROFILE_BUTTON, ALIC_INFO_BUTTON, - ALIC_PERMISSION_EDIT_THEIRS, - ALIC_PERMISSION_EDIT_MINE, - ALIC_PERMISSION_MAP, ALIC_PERMISSION_ONLINE, + ALIC_PERMISSION_MAP, + ALIC_PERMISSION_EDIT_MINE, + ALIC_PERMISSION_EDIT_THEIRS, ALIC_INTERACTION_TIME, ALIC_NAME, ALIC_ICON, |