diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-05-20 14:38:37 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-05-20 14:38:37 -0600 |
| commit | b8fa70502c5bc7bdb9dba7fde4251424a9041c9e (patch) | |
| tree | bd0f2d943fe615b089406e6e8896c3aadc72c10b /indra/newview/llavatarlist.cpp | |
| parent | 46309f558ed1ce459d11aa76de35679fa81a4823 (diff) | |
| parent | 5e353cbf86693ad18b0c9a3f75234c1fa6378005 (diff) | |
Merge
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 |