summaryrefslogtreecommitdiff
path: root/indra/llxuixml/llinitparam.h
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-11-23 10:15:00 -0800
committerJames Cook <james@lindenlab.com>2009-11-23 10:15:00 -0800
commit83237f875cb26d9f72055a5d47cdb928b30c0dc6 (patch)
tree1a4176f230cdf86d646d746610c4861d6417d0e5 /indra/llxuixml/llinitparam.h
parent67c832d94b53fb5d32ec27eebf7f57b668e899db (diff)
Allow large paramblocks by converting mEnclosingBlockOffset to U16, needed for
location_input.xml
Diffstat (limited to 'indra/llxuixml/llinitparam.h')
-rw-r--r--indra/llxuixml/llinitparam.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h
index 9fb464ca7b..b563c6fe51 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)mEnclosingBlockOffset));
}
private:
friend class BaseBlock;
bool mIsProvided;
- S16 mEnclosingBlockOffset;
+ U16 mEnclosingBlockOffset;
};
// various callbacks and constraints associated with an individual param