summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-27 11:57:55 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-27 11:57:55 -0800
commitf714e527c57741a6e60fe4bf5fa242b5d8e3d861 (patch)
tree3428e229d29afee10cac49b5a6cf86b17d26c2f3
parent3acf25d5fc7d3efcc2e13096ff781897ebf31346 (diff)
CID-415
Checker: DEADCODE Function: LLToolPie::handleTooltipObject(LLViewerObject *, std::basic_string<char, std::char_traits<char>, std::allocator<char>>, std::basic_string<char, std::char_traits<char>, std::allocator<char>>) File: /indra/newview/lltoolpie.cpp
-rw-r--r--indra/newview/lltoolpie.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index c79a66892d..39e71974fd 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -922,7 +922,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
const LLMediaEntry* mep = tep->hasMedia() ? tep->getMediaData() : NULL;
if (mep)
{
- viewer_media_t media_impl = mep ? LLViewerMedia::getMediaImplFromTextureID(mep->getMediaID()) : NULL;
+ viewer_media_t media_impl = LLViewerMedia::getMediaImplFromTextureID(mep->getMediaID());
LLPluginClassMedia* media_plugin = NULL;
if (media_impl.notNull() && (media_impl->hasMedia()))