summaryrefslogtreecommitdiff
path: root/indra/llui/tests/llurlentry_test.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-05-24 20:35:25 -0400
committerOz Linden <oz@lindenlab.com>2012-05-24 20:35:25 -0400
commit1d01ad116220503ac688641d939a8fee095f817b (patch)
tree6d446188dbfeaf555cf6b9a64c297483f2fa7cc2 /indra/llui/tests/llurlentry_test.cpp
parent1f0addf6e48c54ab33e0f02bab27cdf6e86d55fb (diff)
parent77488911a30021b6576ad5047395405a98e11b8d (diff)
merge changes for DRTVWR-151
Diffstat (limited to 'indra/llui/tests/llurlentry_test.cpp')
-rw-r--r--indra/llui/tests/llurlentry_test.cpp15
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