diff options
| author | Leslie Linden <none@none> | 2011-06-08 15:46:34 -0700 |
|---|---|---|
| committer | Leslie Linden <none@none> | 2011-06-08 15:46:34 -0700 |
| commit | 86470d3889436017264a69d57fb2060a591955f4 (patch) | |
| tree | 8c262d019b1dd3c8eba83bfbe3025003bba58a9b /indra/llui | |
| parent | 1361eeae4e4538c175a32d48246897c4659cc26c (diff) | |
Fixed to allow param blocks to exceed 64k, even though the size makes me wince.
Modified viewer window to not create a navigation bar on exit if one doesn't yet exist.
Reviewed by Richard.
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; } |