Skip to content
Snippets Groups Projects
Commit 104f3275 authored by Xiaohong Bao's avatar Xiaohong Bao
Browse files

add LLImageGL::create(...) back for server side use.

parent 77f56a3f
No related branches found
No related tags found
No related merge requests found
...@@ -262,6 +262,31 @@ void LLImageGL::restoreGL() ...@@ -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) LLImageGL::LLImageGL(BOOL usemipmaps)
: mSaveData(0) : mSaveData(0)
{ {
......
...@@ -71,7 +71,14 @@ class LLImageGL : public LLRefCount ...@@ -71,7 +71,14 @@ class LLImageGL : public LLRefCount
static S32 updateBoundTexMem(const S32 delta); static S32 updateBoundTexMem(const S32 delta);
static bool checkSize(S32 width, S32 height); 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: public:
LLImageGL(BOOL usemipmaps = TRUE); LLImageGL(BOOL usemipmaps = TRUE);
LLImageGL(U32 width, U32 height, U8 components, BOOL usemipmaps = TRUE); LLImageGL(U32 width, U32 height, U8 components, BOOL usemipmaps = TRUE);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment