diff options
author | Oz Linden <oz@lindenlab.com> | 2012-05-25 14:22:33 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-05-25 14:22:33 -0400 |
commit | ee66cb3efccd6976c5a7725620956ea7030b7b57 (patch) | |
tree | 7ae469e4d2aac985589e7df902959b27c603b2ad /indra/llui/tests/llurlentry_test.cpp | |
parent | 5ef8372e433896be174d7123bd4663087601a0df (diff) | |
parent | 3e8dab32ee88e0a6fda51c218c61d718cf9dcafa (diff) |
merge back beta tags
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 |