diff options
| author | callum <none@none> | 2009-11-24 14:36:57 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-11-24 14:36:57 -0800 |
| commit | fd74ba5467967cbdb5f7aca8b476080c66df2cd2 (patch) | |
| tree | fac520db60d0b08aea8b803571a04c1a8037803d /indra/llxuixml/llinitparam.h | |
| parent | b0a31eaaee10b92df9e5aa80ccfeb25c5e797ac1 (diff) | |
| parent | fa88f41cccb9aeb5ccfdafbf5da5b34b72be1108 (diff) | |
Merge to tip
Diffstat (limited to 'indra/llxuixml/llinitparam.h')
| -rw-r--r-- | indra/llxuixml/llinitparam.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index 9fb464ca7b..493ddaa378 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -300,14 +300,14 @@ namespace LLInitParam const U8* my_addr = reinterpret_cast<const U8*>(this); // get address of enclosing BLOCK class using stored offset to enclosing BaseBlock class return *const_cast<BaseBlock*>( - reinterpret_cast<const BaseBlock*>(my_addr + (ptrdiff_t)mEnclosingBlockOffset)); + reinterpret_cast<const BaseBlock*>(my_addr - (ptrdiff_t)(S32)mEnclosingBlockOffset)); } private: friend class BaseBlock; bool mIsProvided; - S16 mEnclosingBlockOffset; + U16 mEnclosingBlockOffset; }; // various callbacks and constraints associated with an individual param |