diff options
| author | Richard Linden <none@none> | 2011-04-28 16:56:05 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-04-28 16:56:05 -0700 |
| commit | c14d9b6e5f3fb52d1c8e743c5d28d212551458a1 (patch) | |
| tree | 6c738e9b50f7adc63959fff6bce192d99b4c12b6 /indra/llxuixml | |
| parent | 09594aa3d5510e5c7d9254277977cb0bdd418d2f (diff) | |
fixed build
Diffstat (limited to 'indra/llxuixml')
| -rw-r--r-- | indra/llxuixml/llinitparam.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index 35c3106198..70dad4c8bf 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -478,7 +478,7 @@ namespace LLInitParam bool mergeBlockParam(bool param_provided, BlockDescriptor& block_data, const BaseBlock& other, bool overwrite) { - mergeBlock(block_data, other, overwrite); + return mergeBlock(block_data, other, overwrite); } // take all provided params from other and apply to self bool mergeBlock(BlockDescriptor& block_data, const BaseBlock& other, bool overwrite); @@ -1333,8 +1333,9 @@ namespace LLInitParam { if (param_provided) { - mergeBlock(block_data, other, overwrite); + return mergeBlock(block_data, other, overwrite); } + return false; } // merge with other block @@ -1889,8 +1890,9 @@ namespace LLInitParam { if (param_provided) { - mergeBlock(block_data, other, overwrite); + return mergeBlock(block_data, other, overwrite); } + return false; } bool mergeBlock(BlockDescriptor& block_data, const BaseBlock& other, bool overwrite) |