summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-05-26 10:49:23 -0700
committerJames Cook <james@lindenlab.com>2010-05-26 10:49:23 -0700
commitdd672e6dfbe6347e7498fb32b9cade6a2133f4a8 (patch)
treeb5c7d77f6bb631ee2e294a776a21df882f8ea74a
parentfd26a33ff250c3df6eecf1519a4166c0dc2e716f (diff)
parent779e199c2906d81a5fdad7dba21ba026534c8da7 (diff)
Merge
-rw-r--r--indra/llui/tests/llurlentry_test.cpp21
1 files changed, 21 insertions, 0 deletions
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp
index 4463b6cc6f..009d82ed99 100644
--- a/indra/llui/tests/llurlentry_test.cpp
+++ b/indra/llui/tests/llurlentry_test.cpp
@@ -25,6 +25,7 @@
#include "llurlentry_stub.cpp"
#include "lltut.h"
#include "../lluicolortable.h"
+#include "../lluiimage.h"
#include <boost/regex.hpp>
@@ -35,6 +36,26 @@ LLUIColor LLUIColorTable::getColor(const std::string& name, const LLColor4& defa
LLUIColor::LLUIColor() : mColorPtr(NULL) {}
+LLUIImage::LLUIImage(const std::string& name, LLPointer<LLTexture> image)
+{
+}
+
+LLUIImage::~LLUIImage()
+{
+}
+
+//virtual
+S32 LLUIImage::getWidth() const
+{
+ return 0;
+}
+
+//virtual
+S32 LLUIImage::getHeight() const
+{
+ return 0;
+}
+
namespace tut
{
struct LLUrlEntryData