diff options
author | Richard Linden <none@none> | 2012-07-27 13:42:10 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-07-27 13:42:10 -0700 |
commit | 2da3e2e226cc1c9aaf646dd4e5bf7c87947e5d0c (patch) | |
tree | c2013d9a88a514411454a3967728cf1e97f4922b /indra/llui/llsdparam.cpp | |
parent | 0ee0a5eff41a3763b1fc3fc45a36f87fc6eedac5 (diff) | |
parent | 1da3e890a6a426113c79513d74e94783c5762409 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/llui/llsdparam.cpp')
-rw-r--r-- | indra/llui/llsdparam.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llsdparam.cpp b/indra/llui/llsdparam.cpp index 54c8389772..9f4460a988 100644 --- a/indra/llui/llsdparam.cpp +++ b/indra/llui/llsdparam.cpp @@ -303,7 +303,7 @@ namespace LLInitParam { // LLSD specialization // block param interface - bool ParamValue<LLSD, NOT_BLOCK>::deserializeBlock(Parser& p, Parser::name_stack_range_t name_stack, bool new_name) + bool ParamValue<LLSD, NOT_BLOCK>::deserializeBlock(Parser& p, Parser::name_stack_range_t& name_stack, bool new_name) { if (name_stack.first == name_stack.second && p.readValue<LLSD>(mValue)) |