From b00813ae3ca14a7531d93d35d795ce7c23119886 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Mon, 25 Jan 2010 16:35:50 -0800
Subject: EXT-4388 Crash in octree line segment intersection code

a more complete fix and some sanity to prevent recurrance of a similar problem.

reviewed by bao!
---
 indra/llrender/llimagegl.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llrender/llimagegl.h')

diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h
index facfb7bd62..f0870c3fc4 100644
--- a/indra/llrender/llimagegl.h
+++ b/indra/llrender/llimagegl.h
@@ -193,6 +193,8 @@ public:
 private:
 	LLPointer<LLImageRaw> mSaveData; // used for destroyGL/restoreGL
 	U8* mPickMask;  //downsampled bitmap approximation of alpha channel.  NULL if no alpha channel
+	U16 mPickMaskWidth;
+	U16 mPickMaskHeight;
 	S8 mUseMipMaps;
 	S8 mHasExplicitFormat; // If false (default), GL format is f(mComponents)
 	S8 mAutoGenMips;
-- 
cgit v1.2.3