diff options
author | Oz Linden <oz@lindenlab.com> | 2013-04-16 16:01:32 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-04-16 16:01:32 -0400 |
commit | 327c99cadbcbe15442eaee8e0625ade17dcda61f (patch) | |
tree | 6d89ba35638ae7e0b439150034a0333b1dc4b397 /indra/newview/lltoolgun.cpp | |
parent | e20099155378fd10f7997e36ae8ef150c8c5ad91 (diff) | |
parent | fac6ee27f2d3277494f011271064b0e5e7e02554 (diff) |
merge up to 3.5.2 development
Diffstat (limited to 'indra/newview/lltoolgun.cpp')
-rw-r--r-- | indra/newview/lltoolgun.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolgun.cpp b/indra/newview/lltoolgun.cpp index 857d105361..c1735adc9c 100644 --- a/indra/newview/lltoolgun.cpp +++ b/indra/newview/lltoolgun.cpp @@ -42,7 +42,7 @@ #include "llhudmanager.h" #include "lltoolmgr.h" #include "lltoolgrab.h" - +#include "lluiimage.h" // Linden library includes #include "llwindow.h" // setMouseClipping() |