diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 16:31:48 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 16:31:48 +0000 |
| commit | 4942a7b77917f9a163453ecdd040993965672cc0 (patch) | |
| tree | 3dd01f5e182d2eea2e34528cebe749d948a477fc /indra/llimage | |
| parent | 9fc7049151a16e3722c6ce90899e3c7b63161615 (diff) | |
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
Diffstat (limited to 'indra/llimage')
| -rw-r--r-- | indra/llimage/llimage.cpp | 8 | ||||
| -rw-r--r-- | indra/llimage/llimage.h | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index 1ea0ac2714..ee039aee09 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -8,18 +8,12 @@ #include "linden_common.h" -#include <stdlib.h> -#include <string.h> -#include <stdio.h> -#include <algorithm> -#include <iostream> +#include "llimage.h" #include "llmath.h" -#include "stdtypes.h" #include "v4coloru.h" #include "llmemtype.h" -#include "llimage.h" #include "llimagebmp.h" #include "llimagetga.h" #include "llimagej2c.h" diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h index 5ffed9fbb1..8db2e9c610 100644 --- a/indra/llimage/llimage.h +++ b/indra/llimage/llimage.h @@ -9,7 +9,6 @@ #ifndef LL_LLIMAGE_H #define LL_LLIMAGE_H -#include "stdtypes.h" #include "lluuid.h" #include "llstring.h" #include "llmemory.h" |