summaryrefslogtreecommitdiff
path: root/indra/llui/tests/llurlmatch_test.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2012-01-17 13:33:19 -0500
committerDebi King (Dessie) <dessie@lindenlab.com>2012-01-17 13:33:19 -0500
commitcd64ae7fb8ee781a5bf9ac47dd2428e659b939c9 (patch)
tree9638dfe3ce3a7d5399d6f52552c9e1e3f308fd46 /indra/llui/tests/llurlmatch_test.cpp
parente4f1f611a4736e4b0b78c0d61c3c5f576fec93d0 (diff)
parent2abb1a81c56a27eab02157851cb9e67730231bb6 (diff)
reconciled .hgtags
Diffstat (limited to 'indra/llui/tests/llurlmatch_test.cpp')
-rw-r--r--indra/llui/tests/llurlmatch_test.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llui/tests/llurlmatch_test.cpp b/indra/llui/tests/llurlmatch_test.cpp
index 627f3129e9..7183413463 100644
--- a/indra/llui/tests/llurlmatch_test.cpp
+++ b/indra/llui/tests/llurlmatch_test.cpp
@@ -63,9 +63,6 @@ S32 LLUIImage::getHeight() const
namespace LLInitParam
{
- BaseBlock::BaseBlock() {}
- BaseBlock::~BaseBlock() {}
-
BlockDescriptor::BlockDescriptor() {}
ParamDescriptor::ParamDescriptor(param_handle_t p,
merge_func_t merge_func,
@@ -77,8 +74,6 @@ namespace LLInitParam
S32 max_count){}
ParamDescriptor::~ParamDescriptor() {}
- void BaseBlock::paramChanged(const Param& last_param, bool user_provided) {}
-
void BaseBlock::addParam(BlockDescriptor& block_data, const ParamDescriptorPtr in_param, const char* char_name){}
param_handle_t BaseBlock::getHandleFromParam(const Param* param) const {return 0;}
void BaseBlock::addSynonym(Param& param, const std::string& synonym) {}