diff options
| author | callum_linden <none@none> | 2014-10-17 14:17:58 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-17 14:17:58 -0700 |
| commit | c02ba7ceb5ca3fad58b232ac04f3a702dbb374cf (patch) | |
| tree | e478e90371f41cb05a72e863b6dc8aaf708c1282 /indra | |
| parent | 8db1250b73b89727b60ba852bb65cf09ff824993 (diff) | |
Update to build on Xcode 6.0: collection of similar possibly incorrect logical comparison grouping [-Wlogical-op-parentheses] fixes for clang
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llmath/lloctree.h | 4 | ||||
| -rwxr-xr-x | indra/llmath/llvolume.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h index 7b5240c651..4889da246e 100755 --- a/indra/llmath/lloctree.h +++ b/indra/llmath/lloctree.h @@ -322,8 +322,8 @@ public: //is it here? if (isInside(data->getPositionGroup())) { - if (((getElementCount() < gOctreeMaxCapacity || getSize()[0] <= gOctreeMinSize) && contains(data->getBinRadius()) || - (data->getBinRadius() > getSize()[0] && parent && parent->getElementCount() >= gOctreeMaxCapacity))) + if (((getElementCount() < gOctreeMaxCapacity || ((getSize()[0] <= gOctreeMinSize) && contains(data->getBinRadius()))) || + ((data->getBinRadius() > getSize()[0] && parent && parent->getElementCount() >= gOctreeMaxCapacity)))) { //it belongs here mData.push_back(NULL); mData[mElementCount] = data; diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index d9a68cb577..8c4603d5ea 100755 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -2076,7 +2076,7 @@ LLVolume::LLVolume(const LLVolumeParams ¶ms, const F32 detail, const BOOL ge generate(); - if (mParams.getSculptID().isNull() && mParams.getSculptType() == LL_SCULPT_TYPE_NONE || mParams.getSculptType() == LL_SCULPT_TYPE_MESH) + if ((mParams.getSculptID().isNull() && mParams.getSculptType() == LL_SCULPT_TYPE_NONE) || mParams.getSculptType() == LL_SCULPT_TYPE_MESH) { createVolumeFaces(); } |