diff options
| author | prep <prep@lindenlab.com> | 2011-07-11 13:52:46 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-07-11 13:52:46 -0400 |
| commit | b905b231c93390fdfdccbc255fa1950a83d6eb75 (patch) | |
| tree | aa673669d27d95942e349462f7c88882d947d48d /indra/llui/tests/llurlmatch_test.cpp | |
| parent | 572a1734a5230bb4ecbc3cc1e5ff842e582e9b49 (diff) | |
| parent | 80e60371f8be32719dd19467fd2def80e994aa2d (diff) | |
merge
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; } |