diff options
| author | callum_linden <none@none> | 2014-10-20 10:48:30 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-20 10:48:30 -0700 |
| commit | 5894e380b7a3437f79b03e3d71f0b5b0eaa7215f (patch) | |
| tree | 483a69d6669b03472d23c4b8bfdffba4401dccb8 /indra | |
| parent | c8f3105e76c9e7a1091a15fc1c4a83881cd4fc3d (diff) | |
Update to build on Xcode 6.0: clang demands logical comparison brackets
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llselectmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index eb3a4c37d9..060f6663d4 100755 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -1941,7 +1941,7 @@ void LLSelectMgr::selectionSetMedia(U8 media_type, const LLSD &media_data) llassert(mMediaData.isMap()); const LLTextureEntry *texture_entry = object->getTE(te); if (!mMediaData.isMap() || - (NULL != texture_entry) && !texture_entry->hasMedia() && !mMediaData.has(LLMediaEntry::HOME_URL_KEY)) + ((NULL != texture_entry) && !texture_entry->hasMedia() && !mMediaData.has(LLMediaEntry::HOME_URL_KEY))) { // skip adding/updating media } |