diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-22 11:49:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-22 11:49:41 -0400 |
| commit | 0656620e2d6b4b9ca1fabf4f045df77256f31a60 (patch) | |
| tree | 0480f0c03bb4fbf3fd526aaa061715ab20ac4f22 /indra/llui/tests/llurlentry_test.cpp | |
| parent | b15dca22637b0b2c1947b758a93f51163fb48cf1 (diff) | |
| parent | 8c4555d54fc7c8686ffd139425f4c346576cac50 (diff) | |
merge changes for storm-1187
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 |