diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-09 11:05:29 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-09 11:05:29 -0400 |
| commit | 961d5b1d65fffff7075d0afbce003586b1f3b197 (patch) | |
| tree | d72caf02576506883be2638a458616bd8b5ea292 /indra/llxuixml/llinitparam.cpp | |
| parent | dd6547a55e02a4340cb178c72acff1216a56f84c (diff) | |
| parent | b40a44d24d7e59d9102f603a28ab329046e34b5d (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)); } // |