diff options
| author | Leslie Linden <none@none> | 2011-06-08 15:48:44 -0700 |
|---|---|---|
| committer | Leslie Linden <none@none> | 2011-06-08 15:48:44 -0700 |
| commit | 6e928645b94901518fe452ab7fab0278e87613d7 (patch) | |
| tree | f94413d61460d6d54501c5f7ce2ed92eb4571587 /indra/llui | |
| parent | de78d17e912b7e2a4c563a7a428f11cce33644c0 (diff) | |
| parent | 86470d3889436017264a69d57fb2060a591955f4 (diff) | |
Merge to fix 64k limit on param blocks
Diffstat (limited to 'indra/llui')
| -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 e09ef33d49..3cd61e574e 100644 --- a/indra/llui/tests/llurlmatch_test.cpp +++ b/indra/llui/tests/llurlmatch_test.cpp @@ -95,7 +95,7 @@ namespace LLInitParam { const U8* my_addr = reinterpret_cast<const U8*>(this); const U8* block_addr = reinterpret_cast<const U8*>(enclosing_block); - mEnclosingBlockOffset = (U16)(my_addr - block_addr); + mEnclosingBlockOffset = 0x7FFFffff & ((U32)(my_addr - block_addr)); } bool BaseBlock::deserializeBlock(Parser& p, Parser::name_stack_range_t name_stack, S32 generation){ return true; } |