diff options
author | simon <none@none> | 2013-04-11 16:04:21 -0700 |
---|---|---|
committer | simon <none@none> | 2013-04-11 16:04:21 -0700 |
commit | c7bab8ab8b25249d1f8f87746b50fce4820f542a (patch) | |
tree | f10f811e0a03002b4c545eb5c51f99d7c5b83a5b /indra/newview/llavatariconctrl.cpp | |
parent | a976f5c217ce97c70a7e151b9a490e6a6ebf1396 (diff) | |
parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) |
Merge
Diffstat (limited to 'indra/newview/llavatariconctrl.cpp')
-rwxr-xr-x | indra/newview/llavatariconctrl.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp index 714bde6f37..f34ad23769 100755 --- a/indra/newview/llavatariconctrl.cpp +++ b/indra/newview/llavatariconctrl.cpp @@ -39,6 +39,8 @@ #include "lluictrlfactory.h" #include "llagentdata.h" #include "llfloaterimsession.h" +#include "llviewertexture.h" +#include "llavatarappearancedefines.h" // library includes #include "llavatarnamecache.h" |