diff options
| author | Don Kjer <don@lindenlab.com> | 2011-07-09 14:58:31 -0700 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-07-09 14:58:31 -0700 |
| commit | 121c4034db2de1b73bdab6777f49f302d89af3ca (patch) | |
| tree | 0e0cf941c3838a899d4a31433773e974eb9b4fd4 /indra/llui/tests | |
| parent | 7029c8ff534419a3bcfd0e5fc39a4739e4cdc19c (diff) | |
| parent | 961d5b1d65fffff7075d0afbce003586b1f3b197 (diff) | |
Merge
Diffstat (limited to 'indra/llui/tests')
| -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; } |