diff options
| author | unknown | 2008-12-19 00:17:06 -0700 |
|---|---|---|
| committer | unknown | 2008-12-19 00:17:06 -0700 |
| commit | e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554 (patch) | |
| tree | f4ae195b239b9ae3ed8ca53c2dc6f20a24ff7dc7 /linden/indra/llimage | |
| parent | fuckyougit (diff) | |
| parent | 1.1 wip copy (diff) | |
| download | meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.zip meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.gz meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.bz2 meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.xz | |
resolved merge conflicts
Diffstat (limited to 'linden/indra/llimage')
| -rw-r--r-- | linden/indra/llimage/llimagetga.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llimage/llimagetga.cpp b/linden/indra/llimage/llimagetga.cpp index 32c2111..21d0fd1 100644 --- a/linden/indra/llimage/llimagetga.cpp +++ b/linden/indra/llimage/llimagetga.cpp | |||
| @@ -104,7 +104,7 @@ LLImageTGA::LLImageTGA(const std::string& file_name) | |||
| 104 | 104 | ||
| 105 | LLImageTGA::~LLImageTGA() | 105 | LLImageTGA::~LLImageTGA() |
| 106 | { | 106 | { |
| 107 | delete mColorMap; | 107 | delete [] mColorMap; |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | BOOL LLImageTGA::updateData() | 110 | BOOL LLImageTGA::updateData() |