summaryrefslogtreecommitdiff
path: root/indra/lscript/lscript_execute/lscript_readlso.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2015-03-16 09:49:57 -0700
committerMerov Linden <merov@lindenlab.com>2015-03-16 09:49:57 -0700
commit9ba10bf1f2ee16eb082f4cb29b0b9f7172e7ce8e (patch)
tree9548ff32e0a1dc5b3f8a70b2a386827f72bf5284 /indra/lscript/lscript_execute/lscript_readlso.cpp
parent184bf6a76fd3b52efa83c93f56164d2adce7ed3e (diff)
parentd4a2e9fd9a0e7001a6c824ddd6cf37039a632b9d (diff)
Merge lindenlab/viewer-tools-update
Diffstat (limited to 'indra/lscript/lscript_execute/lscript_readlso.cpp')
-rwxr-xr-xindra/lscript/lscript_execute/lscript_readlso.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/lscript/lscript_execute/lscript_readlso.cpp b/indra/lscript/lscript_execute/lscript_readlso.cpp
index 7ec56c2409..abcb28e998 100755
--- a/indra/lscript/lscript_execute/lscript_readlso.cpp
+++ b/indra/lscript/lscript_execute/lscript_readlso.cpp
@@ -114,7 +114,7 @@ void LLScriptLSOParse::printRegisters(LLFILE *fp)
else if (gMajorVersion == LSL2_MAJOR_VERSION_TWO)
{
U64 data = get_register_u64(mRawData, (LSCRIPTRegisters)i);
- fprintf(fp, "%s: 0x%X%X\n", gLSCRIPTRegisterNames[i], (U32)(data>>32), (U32)(data && 0xFFFFFFFF));
+ fprintf(fp, "%s: 0x%X%X\n", gLSCRIPTRegisterNames[i], (U32)(data>>32), (U32)(data & 0xFFFFFFFF));
}
}
fprintf(fp, "=============================\n\n");