diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-02-03 13:11:04 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-02-03 13:11:04 -0500 |
| commit | f65028e38eda00cd2329bb1ab7db0261ae6452f2 (patch) | |
| tree | 1b7601a5577dd8c439c67d615b1f987c59ceb481 /indra/llui/tests/llurlentry_test.cpp | |
| parent | 90ba675da4416a7f75f59340633e2c007b6cc029 (diff) | |
| parent | 491cd825561be1cf4a6f428a535811cbe0e3f179 (diff) | |
Automated merge with file:///Users/nat/linden/viewer-tut-fix
Diffstat (limited to 'indra/llui/tests/llurlentry_test.cpp')
| -rw-r--r-- | indra/llui/tests/llurlentry_test.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp index c1fb050206..8f0a48018f 100644 --- a/indra/llui/tests/llurlentry_test.cpp +++ b/indra/llui/tests/llurlentry_test.cpp @@ -70,21 +70,6 @@ S32 LLUIImage::getHeight() const return 0; } -namespace LLInitParam -{ - 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 |