summaryrefslogtreecommitdiff
path: root/indra/newview/llselectmgr.cpp
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-01-25 17:54:38 -0500
committerGeenz <geenz@geenzo.com>2013-01-25 17:54:38 -0500
commit5f03e197f4cfb43de93dc42b16b54beafccd376a (patch)
tree77fe17e9c36021148c18f7f9f33aae5abcd100c0 /indra/newview/llselectmgr.cpp
parentcc7ae8fbd1fc249f77ced95171e5c22e48adedb6 (diff)
Trying to set materials up for rendering! Yay!
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rw-r--r--indra/newview/llselectmgr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index c3c37141ed..ff4c120623 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -1927,7 +1927,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
}