diff options
author | Richard Linden <none@none> | 2011-04-19 20:17:05 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-04-19 20:17:05 -0700 |
commit | 98ec4db650c2dbae0e28ae186a43218bff344b49 (patch) | |
tree | f2a630d9cbaca3c6dcf696dce262d8b9140302f5 /indra/llui/tests/llurlentry_test.cpp | |
parent | fe91b0dbf27c432f71ea2ac01997adf332179cc0 (diff) | |
parent | 6b47a5ec782257b1aba31b0c9bec8c6f3709ba6f (diff) |
merge
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 |