diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2016-10-07 19:35:50 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2016-10-07 19:35:50 +0300 |
| commit | 5dd97bc2bd4924b0342068e697b5d45165225b76 (patch) | |
| tree | ac972b537711057a0f824db8fde6274d0228c872 /indra/llrender/llimagegl.h | |
| parent | bfb8eaabe801a41af2eab903e348669414e90814 (diff) | |
| parent | 028fd679296cd241e7dd0aac3e1c33480a9d3c2c (diff) | |
Merged in andreyl_productengine/viewer-bear-marchcat (pull request #20)
Fixes for two image loading crashes
Diffstat (limited to 'indra/llrender/llimagegl.h')
| -rw-r--r-- | indra/llrender/llimagegl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h index 21982eab1d..ad2aea9067 100644 --- a/indra/llrender/llimagegl.h +++ b/indra/llrender/llimagegl.h @@ -94,7 +94,7 @@ protected: public: virtual void dump(); // debugging info to LL_INFOS() - void setSize(S32 width, S32 height, S32 ncomponents, S32 discard_level = -1); + bool setSize(S32 width, S32 height, S32 ncomponents, S32 discard_level = -1); void setComponents(S32 ncomponents) { mComponents = (S8)ncomponents ;} void setAllowCompression(bool allow) { mAllowCompression = allow; } |