diff options
| author | Jon Wolk <jwolk@lindenlab.com> | 2007-12-19 00:56:59 +0000 |
|---|---|---|
| committer | Jon Wolk <jwolk@lindenlab.com> | 2007-12-19 00:56:59 +0000 |
| commit | 7dd08303a3ebf9718c2c60a4d94b81d5d7845f8c (patch) | |
| tree | 6195a8585cc7998647afcaec2167e728e4abd3c1 /indra/llui/lliconctrl.h | |
| parent | 4d87303e78c1accde85b217b325e0c08930b0c4c (diff) | |
svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
Diffstat (limited to 'indra/llui/lliconctrl.h')
| -rw-r--r-- | indra/llui/lliconctrl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h index b789269558..1e474d0935 100644 --- a/indra/llui/lliconctrl.h +++ b/indra/llui/lliconctrl.h @@ -73,7 +73,7 @@ protected: LLColor4 mColor; LLString mImageName; LLUUID mImageID; - LLPointer<LLImageGL> mImagep; + LLPointer<LLUIImage> mImagep; }; #endif |