summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolpie.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-15 17:56:33 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-15 17:56:33 +0000
commit4bb57fde32fbcf59eaf4de97aef547290fe34aec (patch)
tree19fd49fa91598a9e3a890b6519c71babb55d1111 /indra/newview/lltoolpie.cpp
parent6810ea5c4a763558a6c344780047a5249c317d54 (diff)
CID-39
Checker: DEADCODE Function: LLToolPie::handleMediaClick(const LLPickInfo &) File: /indra/newview/lltoolpie.cpp simply some redundant checking, cleared-up for clarity
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
-rw-r--r--indra/newview/lltoolpie.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index fdf9e1df2e..fb78b6a415 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1263,11 +1263,10 @@ bool LLToolPie::handleMediaClick(const LLPickInfo& pick)
return false;
LLMediaEntry* mep = (tep->hasMedia()) ? tep->getMediaData() : NULL;
-
if(!mep)
return false;
- viewer_media_t media_impl = mep ? LLViewerMedia::getMediaImplFromTextureID(mep->getMediaID()) : NULL;
+ viewer_media_t media_impl = LLViewerMedia::getMediaImplFromTextureID(mep->getMediaID());
if (gSavedSettings.getBOOL("MediaOnAPrimUI"))
{