diff options
author | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:35:39 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:35:39 -0400 |
commit | 068e3cc469793c75b0d54ef0864388582bb3b63c (patch) | |
tree | dbab152cf43bc84f23b2f63f9e8f8d83117e28af /indra/llui/tests/llurlentry_test.cpp | |
parent | e748167abfabbc541c3ceb9e2d5a46fa3564f15a (diff) | |
parent | 8158c5637a9ad83a7b36b104116c37390b57c7ab (diff) |
pull fix for STORM-304 / STORM-386
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 |