From 104f32750e6ac3349e85d2c9b00a8b26c78c017a Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Sat, 11 Jul 2009 02:09:37 +0000
Subject: [PATCH] add LLImageGL::create(...) back for server side use.
---
indra/llrender/llimagegl.cpp | 25 +++++++++++++++++++++++++
indra/llrender/llimagegl.h | 9 ++++++++-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index c4d91209e65..a86a0aac23f 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 84c0f8746e9..09210b1ef18 100644
--- a/indra/llrender/llimagegl.h
+++ b/indra/llrender/llimagegl.h
@@ -71,7 +71,14 @@ class LLImageGL : public LLRefCount
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);
--
GitLab