From 5bf9343a41ca41cc8da8f00902304b012c8db61b Mon Sep 17 00:00:00 2001 From: callum_linden Date: Fri, 17 Oct 2014 16:14:27 -0700 Subject: Update to build on Xcode 6.0: replace logical && with bitwise version --- indra/lscript/lscript_execute/lscript_readlso.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/lscript') 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"); -- cgit v1.2.3