summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-10-17 16:14:27 -0700
committercallum_linden <none@none>2014-10-17 16:14:27 -0700
commit5bf9343a41ca41cc8da8f00902304b012c8db61b (patch)
tree0029163a35f0b066bfeb1062f2acfa4776a68c6e /indra
parent217556cbaa1539db7392371b8b5ba97587341704 (diff)
Update to build on Xcode 6.0: replace logical && with bitwise version
Diffstat (limited to 'indra')
-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");