From c14d9b6e5f3fb52d1c8e743c5d28d212551458a1 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 28 Apr 2011 16:56:05 -0700
Subject: [PATCH] fixed build
---
indra/llxuixml/llinitparam.h | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h
index 35c3106198b..70dad4c8bf4 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)
--
GitLab