diff options
| author | Richard Linden <none@none> | 2011-04-28 14:56:46 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-04-28 14:56:46 -0700 |
| commit | 31a2923b3d96ed4a04d0b27018fc71d0d66b6a5b (patch) | |
| tree | f287310a81f1183f4856fdbf17a9acd041e69d70 /indra/llui/tests/llurlmatch_test.cpp | |
| parent | 8c4555d54fc7c8686ffd139425f4c346576cac50 (diff) | |
EXP-749 FIX [REGRESSION] Voice status indicator shown in IM session instead of profile pic in Basic and Advanced modes
reviewed by Leyla
Diffstat (limited to 'indra/llui/tests/llurlmatch_test.cpp')
| -rw-r--r-- | indra/llui/tests/llurlmatch_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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) |