diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-17 15:48:07 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-17 15:48:07 -0800 |
| commit | 61f3c1b41ddedc16f2026c62600475105621b305 (patch) | |
| tree | af2124f540a4ff55c08cec7038458e883747fe47 /indra/llimage/llimage.h | |
| parent | 2d25eb18adc0c2c97c63a8e02f2274362672137c (diff) | |
| parent | c6a0f0ae1dec5ef2f7657d8c1ca07d85c1fef55d (diff) | |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/llimage/llimage.h')
| -rw-r--r-- | indra/llimage/llimage.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h index 9ce77a0d01..5f54585005 100644 --- a/indra/llimage/llimage.h +++ b/indra/llimage/llimage.h @@ -189,7 +189,7 @@ protected: public: LLImageRaw(); LLImageRaw(U16 width, U16 height, S8 components); - LLImageRaw(U8 *data, U16 width, U16 height, S8 components); + LLImageRaw(U8 *data, U16 width, U16 height, S8 components, bool no_copy = false); // Construct using createFromFile (used by tools) //LLImageRaw(const std::string& filename, bool j2c_lowest_mip_only = false); |