diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2009-07-11 02:09:37 +0000 | 
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2009-07-11 02:09:37 +0000 | 
| commit | 104f32750e6ac3349e85d2c9b00a8b26c78c017a (patch) | |
| tree | f80a768dca895dd3704515666a81c7ed669a3992 | |
| parent | 77f56a3f3db72b2938eadb0868fc7be975dabafa (diff) | |
add LLImageGL::create(...) back for server side use.
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 25 | ||||
| -rw-r--r-- | indra/llrender/llimagegl.h | 9 | 
2 files changed, 33 insertions, 1 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index c4d91209e6..a86a0aac23 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -262,6 +262,31 @@ void LLImageGL::restoreGL()  }  //---------------------------------------------------------------------------- + +//for server side use only. +//static  +BOOL LLImageGL::create(LLPointer<LLImageGL>& dest, BOOL usemipmaps) +{ +	dest = new LLImageGL(usemipmaps); +	return TRUE; +} + +//for server side use only. +BOOL LLImageGL::create(LLPointer<LLImageGL>& dest, U32 width, U32 height, U8 components, BOOL usemipmaps) +{ +	dest = new LLImageGL(width, height, components, usemipmaps); +	return TRUE; +} + +//for server side use only. +BOOL LLImageGL::create(LLPointer<LLImageGL>& dest, const LLImageRaw* imageraw, BOOL usemipmaps) +{ +	dest = new LLImageGL(imageraw, usemipmaps); +	return TRUE; +} + +//---------------------------------------------------------------------------- +  LLImageGL::LLImageGL(BOOL usemipmaps)  	: mSaveData(0)  { diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h index 84c0f8746e..09210b1ef1 100644 --- a/indra/llrender/llimagegl.h +++ b/indra/llrender/llimagegl.h @@ -71,7 +71,14 @@ public:  	static S32 updateBoundTexMem(const S32 delta);  	static bool checkSize(S32 width, S32 height); -	 + +	//for server side use only. +	// Not currently necessary for LLImageGL, but required in some derived classes, +	// so include for compatability +	static BOOL create(LLPointer<LLImageGL>& dest, BOOL usemipmaps = TRUE); +	static BOOL create(LLPointer<LLImageGL>& dest, U32 width, U32 height, U8 components, BOOL usemipmaps = TRUE); +	static BOOL create(LLPointer<LLImageGL>& dest, const LLImageRaw* imageraw, BOOL usemipmaps = TRUE); +		  public:  	LLImageGL(BOOL usemipmaps = TRUE);  	LLImageGL(U32 width, U32 height, U8 components, BOOL usemipmaps = TRUE);  | 
