diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-07-12 13:59:26 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-07-12 13:59:26 -0400 |
| commit | b750a5afb7833d91aed88d9d1f75ee0b4bc2aa80 (patch) | |
| tree | ee54bbaed8f2f6016915cd3bb0506805e33179aa /indra/llxuixml/llinitparam.cpp | |
| parent | 543943279894d76662833c3b4e35efd7d09a91fc (diff) | |
| parent | 44c7c6feaa824f4049d326965cb066e76ebefee3 (diff) | |
merge
Diffstat (limited to 'indra/llxuixml/llinitparam.cpp')
| -rw-r--r-- | indra/llxuixml/llinitparam.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index b3312798dd..c024fd405e 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -40,7 +40,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)); } // |