diff options
author | Richard Linden <none@none> | 2011-04-28 15:12:38 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-04-28 15:12:38 -0700 |
commit | 09594aa3d5510e5c7d9254277977cb0bdd418d2f (patch) | |
tree | 0523ef3b59d71f4068044d3d5e2fcd4efdc23bd4 /indra/llui | |
parent | 363e296dde5fbd56f9bf4382285b162712d582e2 (diff) | |
parent | 1128a15f0be3e12104fdb49e0a3417ecea6faccb (diff) |
Automated merge with bundle:E:\code\viewer-experience-merge+c:\users\richard\appdata\local\temp\thg.ia7ixc\http__hg.secondlife.com_viewer-development_csqen8.hg
Diffstat (limited to 'indra/llui')
-rw-r--r-- | indra/llui/tests/llurlentry_stub.cpp | 2 | ||||
-rw-r--r-- | indra/llui/tests/llurlmatch_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp index 75946b2416..26b3b17577 100644 --- a/indra/llui/tests/llurlentry_stub.cpp +++ b/indra/llui/tests/llurlentry_stub.cpp @@ -127,7 +127,7 @@ namespace LLInitParam bool BaseBlock::deserializeBlock(Parser& p, Parser::name_stack_range_t name_stack, S32 generation){ return true; } void BaseBlock::serializeBlock(Parser& parser, Parser::name_stack_t name_stack, const LLInitParam::BaseBlock* diff_block) const {} bool BaseBlock::inspectBlock(Parser& parser, Parser::name_stack_t name_stack, S32 min_value, S32 max_value) const { return true; } - bool BaseBlock::merge(BlockDescriptor& block_data, const BaseBlock& other, bool overwrite) { return true; } + bool BaseBlock::mergeBlock(BlockDescriptor& block_data, const BaseBlock& other, bool overwrite) { return true; } bool BaseBlock::validateBlock(bool emit_errors) const { return true; } ParamValue<LLUIColor, TypeValues<LLUIColor> >::ParamValue(const LLUIColor& color) diff --git a/indra/llui/tests/llurlmatch_test.cpp b/indra/llui/tests/llurlmatch_test.cpp index aea605c9f2..e09ef33d49 100644 --- a/indra/llui/tests/llurlmatch_test.cpp +++ b/indra/llui/tests/llurlmatch_test.cpp @@ -101,7 +101,7 @@ namespace LLInitParam bool BaseBlock::deserializeBlock(Parser& p, Parser::name_stack_range_t name_stack, S32 generation){ return true; } void BaseBlock::serializeBlock(Parser& parser, Parser::name_stack_t name_stack, const LLInitParam::BaseBlock* diff_block) const {} bool BaseBlock::inspectBlock(Parser& parser, Parser::name_stack_t name_stack, S32 min_count, S32 max_count) const { return true; } - bool BaseBlock::merge(BlockDescriptor& block_data, const BaseBlock& other, bool overwrite) { return true; } + bool BaseBlock::mergeBlock(BlockDescriptor& block_data, const BaseBlock& other, bool overwrite) { return true; } bool BaseBlock::validateBlock(bool emit_errors) const { return true; } ParamValue<LLUIColor, TypeValues<LLUIColor> >::ParamValue(const LLUIColor& color) |