diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-04-20 23:49:00 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-04-20 23:49:00 -0700 |
| commit | 4bb8273255d9d46c4cd2f64d1bd188d249b34d4d (patch) | |
| tree | 153eecaf08e0a52b1a47ffebc10b167ad6c527ac /indra/llui/tests/llurlentry_test.cpp | |
| parent | 5e12569b76593c5dc64894674cc629040654c68a (diff) | |
| parent | c82219934dfc20d8e4401ed875f9c59c16ab922c (diff) | |
merge leslie changes
Diffstat (limited to 'indra/llui/tests/llurlentry_test.cpp')
| -rw-r--r-- | indra/llui/tests/llurlentry_test.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp index 8f0a48018f..2f814f4200 100644 --- a/indra/llui/tests/llurlentry_test.cpp +++ b/indra/llui/tests/llurlentry_test.cpp @@ -70,6 +70,22 @@ S32 LLUIImage::getHeight() const return 0; } +namespace LLInitParam +{ + S32 Parser::sNextParseGeneration = 0; + BlockDescriptor::BlockDescriptor() {} + ParamDescriptor::ParamDescriptor(param_handle_t p, + merge_func_t merge_func, + deserialize_func_t deserialize_func, + serialize_func_t serialize_func, + validation_func_t validation_func, + inspect_func_t inspect_func, + S32 min_count, + S32 max_count){} + ParamDescriptor::~ParamDescriptor() {} + +} + namespace tut { struct LLUrlEntryData |