diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-05 13:30:20 -0700 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-05 13:30:20 -0700 |
commit | 447dc782fd4d490387fd98e9fb41135038512767 (patch) | |
tree | b7875f5dd54d4068d777adbe90a3dd36b99a38eb /indra/llui/tests/llurlentry_test.cpp | |
parent | d5d4a065275d1db1093111222f29942ee171f81c (diff) | |
parent | 124a59263184391b0b4ec418c532b7a715e9b5a3 (diff) |
Merge latest from lindenlab/viewer-development
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 |