diff options
| author | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
| commit | fdf944fb0355249d73c4e25ee86e9ffd378e7d4b (patch) | |
| tree | 2e5c51fe0e6d5757f984721e01cc097801d927e7 /linden/indra/newview/lltoolmgr.cpp | |
| parent | Rebranded Windows-specific installer/support files. (diff) | |
| parent | Updated source to SL version 1.21.6. (diff) | |
| download | meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.zip meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.gz meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.bz2 meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.xz | |
Merge branch 'merge-1.21.6' into rebranding
Conflicts:
linden/indra/newview/installers/windows/installer_template.nsi
linden/indra/newview/llappviewer.cpp
Diffstat (limited to 'linden/indra/newview/lltoolmgr.cpp')
| -rw-r--r-- | linden/indra/newview/lltoolmgr.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/lltoolmgr.cpp b/linden/indra/newview/lltoolmgr.cpp index 19ebe28..89407f7 100644 --- a/linden/indra/newview/lltoolmgr.cpp +++ b/linden/indra/newview/lltoolmgr.cpp | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include "lltool.h" | 36 | #include "lltool.h" |
| 37 | // tools and manipulators | 37 | // tools and manipulators |
| 38 | #include "llmanipscale.h" | 38 | #include "llmanipscale.h" |
| 39 | #include "llselectmgr.h" | ||
| 39 | #include "lltoolbrush.h" | 40 | #include "lltoolbrush.h" |
| 40 | #include "lltoolcomp.h" | 41 | #include "lltoolcomp.h" |
| 41 | #include "lltooldraganddrop.h" | 42 | #include "lltooldraganddrop.h" |