diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-19 15:58:56 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-19 15:58:56 -0700 |
| commit | ac17ec0c287246dbb00d21a6b4994949eac69737 (patch) | |
| tree | 3da999db2b63dbaa74a8c7ce2572e3f17df454dd /indra/newview/llavatarlistitem.cpp | |
| parent | 77f795cae59f7fa52d57ba30469cb0ddb744ac4d (diff) | |
| parent | 61cb3d31137f30f3766dbe3c22d700fbdf517d80 (diff) | |
Merge pull from dessie/viewer-public
Diffstat (limited to 'indra/newview/llavatarlistitem.cpp')
| -rw-r--r-- | indra/newview/llavatarlistitem.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp index a59ad306d7..4e018c5784 100644 --- a/indra/newview/llavatarlistitem.cpp +++ b/indra/newview/llavatarlistitem.cpp @@ -36,13 +36,14 @@ #include "llavataractions.h" #include "llavatarlistitem.h" +#include "llbutton.h" #include "llfloaterreg.h" +#include "lltextutil.h" + #include "llagent.h" #include "llavatarnamecache.h" -#include "lloutputmonitorctrl.h" #include "llavatariconctrl.h" -#include "lltextutil.h" -#include "llbutton.h" +#include "lloutputmonitorctrl.h" bool LLAvatarListItem::sStaticInitialized = false; S32 LLAvatarListItem::sLeftPadding = 0; |