diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-19 10:04:23 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-19 10:04:23 +0100 |
| commit | 02fe5d60c0a6664bb86254347ce31467da2d90c3 (patch) | |
| tree | fe1420806e453a14a63b4f16ad2d566a8c9a0d1a /indra/newview/llavatarlist.cpp | |
| parent | cd0ab5b41eda85b9cb4855f61c3f7e4ca5150797 (diff) | |
| parent | b550bb0f09197c35b80d18d540761a7831c3e89b (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/llavatarlist.cpp')
| -rw-r--r-- | indra/newview/llavatarlist.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp index 72ee289c91..24290ac089 100644 --- a/indra/newview/llavatarlist.cpp +++ b/indra/newview/llavatarlist.cpp @@ -32,19 +32,21 @@ #include "llviewerprecompiledheaders.h" +#include "llavatarlist.h" + // common #include "lltrans.h" #include "llcommonutils.h" -#include "llavatarlist.h" -#include "llagentdata.h" // for comparator +// llui +#include "lltextutil.h" // newview +#include "llagentdata.h" // for comparator #include "llavatariconctrl.h" #include "llcallingcard.h" // for LLAvatarTracker #include "llcachename.h" #include "llrecentpeople.h" -#include "lltextutil.h" #include "lluuid.h" #include "llvoiceclient.h" #include "llviewercontrol.h" // for gSavedSettings |