diff options
author | Tonya Souther <tonya.souther@gmail.com> | 2013-01-31 11:40:16 -0600 |
---|---|---|
committer | Tonya Souther <tonya.souther@gmail.com> | 2013-01-31 11:40:16 -0600 |
commit | c1b110dd1d002b2bcb340dad9350b9717e1ca325 (patch) | |
tree | 6466c6c9a1481ef1ced85d5a1a22bdd0978a11ec /indra/newview/llselectmgr.cpp | |
parent | d53f69b67f2aed05fd763932f25cc8b5c40ec774 (diff) | |
parent | d1b224158da7b2e6f7329eadfbd555e9941e1bf9 (diff) |
Merging in main repository.
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rw-r--r-- | 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 6f855ad30d..c93cecdd5d 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -1928,7 +1928,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 } |