diff options
| author | Richard Linden <none@none> | 2011-06-23 11:28:23 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-06-23 11:28:23 -0700 |
| commit | 70fc5af53ffc39c3c0ef32b99a6c83e972b8a117 (patch) | |
| tree | ddc8da9d6365611c777c324b38a91f5346c6228e /indra/llui/tests/llurlmatch_test.cpp | |
| parent | b343d25d19a7d21470027da379c7f16bc7fcb9fc (diff) | |
| parent | 715cb3cc0ca968002af247d0ba67a5d3bed76756 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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 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; } |