diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-19 17:59:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-19 17:59:55 -0500 |
| commit | 0031e9a97be1bf6e9fe773c23506494d09ce91ae (patch) | |
| tree | 220f195c82174b7cc8e94dceb2553e59fe5837a5 /indra/newview/llgroupiconctrl.cpp | |
| parent | b7edc965bc77ab21e9a1e3f6b424299a50053529 (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
merge up to 3.6.10-release; some of the storm-68 changes lost
Diffstat (limited to 'indra/newview/llgroupiconctrl.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llgroupiconctrl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llgroupiconctrl.cpp b/indra/newview/llgroupiconctrl.cpp index 2f9810775b..2d0fc26c2a 100644..100755 --- a/indra/newview/llgroupiconctrl.cpp +++ b/indra/newview/llgroupiconctrl.cpp @@ -29,6 +29,7 @@ #include "llgroupiconctrl.h" #include "llagent.h" +#include "llviewertexture.h" /* #include "llavatarconstants.h" #include "llcallingcard.h" // for LLAvatarTracker @@ -38,7 +39,7 @@ #include "llcachename.h" #include "llagentdata.h" -#include "llimfloater.h" +#include "llfloaterimsession.h" */ static LLDefaultChildRegistry::Register<LLGroupIconCtrl> g_i("group_icon"); |