summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-01-15 10:27:49 -0800
committerMerov Linden <merov@lindenlab.com>2014-01-15 10:27:49 -0800
commit4b2e69d8e054134bea7216639effef90b51c3aae (patch)
tree3c537e7e4f63af1c37e230c6413827d930693270 /indra
parent349e5565348ea68d0e74af605876ac373b6805c3 (diff)
ACME-1236 : Clean up llimage after refactoring so there's no difference with viewer-release
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llimage/llimage.cpp7
-rwxr-xr-xindra/llimage/llimage.h2
2 files changed, 2 insertions, 7 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 7981ca7364..c8a05e1fae 100755
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -29,10 +29,7 @@
#include "llimage.h"
#include "llmath.h"
-#include "v3color.h"
#include "v4coloru.h"
-#include "m3math.h"
-#include "v3math.h"
#include "llimagebmp.h"
#include "llimagetga.h"
@@ -108,8 +105,8 @@ LLImageBase::~LLImageBase()
deleteData(); // virtual
}
-//static
-void LLImageBase::createPrivatePool()
+//static
+void LLImageBase::createPrivatePool()
{
if(!sPrivatePoolp)
{
diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h
index 4b1da233e1..2277afc585 100755
--- a/indra/llimage/llimage.h
+++ b/indra/llimage/llimage.h
@@ -71,8 +71,6 @@ const S32 HTTP_PACKET_SIZE = 1496;
class LLImageFormatted;
class LLImageRaw;
class LLColor4U;
-class LLColor3;
-class LLMatrix3;
class LLPrivateMemoryPool;
typedef enum e_image_codec