diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-07-02 00:38:13 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-02 00:38:13 +0000 |
commit | 39905b927d60e204438705728d2c214cb3f9ef81 (patch) | |
tree | 7bb617cc204514b233e081457d905693aa0ae409 /indra/newview/lltoolpie.cpp | |
parent | 687cff0eb8dfe663b99e18cfd953e0764d8ab372 (diff) |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
-rw-r--r-- | indra/newview/lltoolpie.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index a6dcebc3b5..a89e79c8b8 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -48,6 +48,7 @@ #include "llhoverview.h" #include "llhudeffecttrail.h" #include "llhudmanager.h" +#include "llmediamanager.h" #include "llmenugl.h" #include "llmutelist.h" #include "llselectmgr.h" |