diff options
author | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:09:35 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:09:35 -0700 |
commit | ba3307b8d0f2ceb40454174a6593f3f98ce98b65 (patch) | |
tree | 7c016ab72795543361d206de5344b34a6a823fdf /indra/llui/tests/llurlentry_test.cpp | |
parent | dac53830f1a67c8657ced9c39eccedbadf149bd9 (diff) | |
parent | 40979589afc5c91cab977307a1e400315b1c8a8f (diff) |
merge with STORM-105
Diffstat (limited to 'indra/llui/tests/llurlentry_test.cpp')
-rw-r--r-- | indra/llui/tests/llurlentry_test.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp index 95affe4460..5c6623da61 100644 --- a/indra/llui/tests/llurlentry_test.cpp +++ b/indra/llui/tests/llurlentry_test.cpp @@ -30,6 +30,7 @@ #include "llurlentry_stub.cpp" #include "lltut.h" #include "../lluicolortable.h" +#include "../lluiimage.h" #include <boost/regex.hpp> @@ -40,6 +41,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 |