diff options
author | Oz Linden <oz@lindenlab.com> | 2013-06-19 13:59:52 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-06-19 13:59:52 -0400 |
commit | e23228fef2834587af490d0345f29212445666d8 (patch) | |
tree | dfa761027aca1227ec1817707f8141b833c061df /indra/newview/llgroupiconctrl.cpp | |
parent | c880c961bb2a0838bc529efc07cfeb12f5636d88 (diff) | |
parent | 8a330ee2eb1008951f5e5159057fa5736dd805b4 (diff) |
merge 3.5.0-release
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"); |