diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-26 16:24:49 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-26 16:24:49 -0700 |
| commit | c5c13a92eb62e1e9927a9685d5433c040e6ef2ce (patch) | |
| tree | 0134513ccbd15cccd193bc38772eb5147e0f4591 /indra/llui/tests/llurlmatch_test.cpp | |
| parent | abcdff128c85c5a1188da8e36510f249e5918899 (diff) | |
| parent | db119d86a7a930c64b022c41386d37c001555d68 (diff) | |
Merge
Diffstat (limited to 'indra/llui/tests/llurlmatch_test.cpp')
| -rw-r--r-- | indra/llui/tests/llurlmatch_test.cpp | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/indra/llui/tests/llurlmatch_test.cpp b/indra/llui/tests/llurlmatch_test.cpp index 85318196e0..d6ef5132c8 100644 --- a/indra/llui/tests/llurlmatch_test.cpp +++ b/indra/llui/tests/llurlmatch_test.cpp @@ -20,7 +20,10 @@ * $/LicenseInfo$ */ +#include "linden_common.h" + #include "../llurlmatch.h" +#include "../lluiimage.h" #include "lltut.h" // link seams @@ -33,6 +36,26 @@ LLStyle::Params::Params() { } +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 LLInitParam { BaseBlock::BaseBlock() {} @@ -105,7 +128,6 @@ namespace LLInitParam void TypedParam<LLUIImage*>::setBlockFromValue() {} - bool ParamCompare<LLUIImage*, false>::equals( LLUIImage* const &a, |