diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-19 15:25:22 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-19 15:25:22 -0400 |
| commit | 6807214bb988e09e678534f23c8380e811df8831 (patch) | |
| tree | fc030ee780f7c929c70d7a65d0343fa57b2c739d /indra/newview/llgroupiconctrl.cpp | |
| parent | ca17a74f1848b16b8a4f2412ed093aef4bad5830 (diff) | |
| parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) | |
merge changes for 3.5.0-beta3 (chui)
Diffstat (limited to 'indra/newview/llgroupiconctrl.cpp')
| -rw-r--r-- | indra/newview/llgroupiconctrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llgroupiconctrl.cpp b/indra/newview/llgroupiconctrl.cpp index 2f9810775b..188c4bcf25 100644 --- a/indra/newview/llgroupiconctrl.cpp +++ b/indra/newview/llgroupiconctrl.cpp @@ -38,7 +38,7 @@ #include "llcachename.h" #include "llagentdata.h" -#include "llimfloater.h" +#include "llfloaterimsession.h" */ static LLDefaultChildRegistry::Register<LLGroupIconCtrl> g_i("group_icon"); |