From 4b2e69d8e054134bea7216639effef90b51c3aae Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 15 Jan 2014 10:27:49 -0800
Subject: [PATCH] ACME-1236 : Clean up llimage after refactoring so there's no
difference with viewer-release
---
indra/llimage/llimage.cpp | 7 ++-----
indra/llimage/llimage.h | 2 --
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 7981ca7364c..c8a05e1faea 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 4b1da233e1d..2277afc5852 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
--
GitLab