diff options
| author | Richard Linden <none@none> | 2013-06-05 19:08:35 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-05 19:08:35 -0700 |
| commit | 702bd5107a71aa3ac7c779a1e2ff0eaa53161e13 (patch) | |
| tree | feca9cc804b88e4f1b78a811ae7af359c67e5455 /indra/newview/llgroupiconctrl.cpp | |
| parent | 6cf85d1bf3eae2d2d798b756100c048ec2b1c411 (diff) | |
| parent | e1d96d72692d70f7e16fb93d6ef1d42c89d26409 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llgroupiconctrl.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llgroupiconctrl.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llgroupiconctrl.cpp b/indra/newview/llgroupiconctrl.cpp index 2bcee69b91..2d0fc26c2a 100644..100755 --- a/indra/newview/llgroupiconctrl.cpp +++ b/indra/newview/llgroupiconctrl.cpp @@ -30,6 +30,17 @@ #include "llagent.h" #include "llviewertexture.h" +/* +#include "llavatarconstants.h" +#include "llcallingcard.h" // for LLAvatarTracker +#include "llavataractions.h" +#include "llmenugl.h" +#include "lluictrlfactory.h" + +#include "llcachename.h" +#include "llagentdata.h" +#include "llfloaterimsession.h" +*/ static LLDefaultChildRegistry::Register<LLGroupIconCtrl> g_i("group_icon"); |