diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-16 13:20:05 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-16 13:20:05 +0200 |
| commit | 07a5274e8cb051b74d955690799c2e5ae90e5ff5 (patch) | |
| tree | f5bef8e3f88a5186bd90db897110e51794c5a086 /indra/newview/lltoolpie.cpp | |
| parent | f808bafa663b5b855cbb26af552bbca1caa4c026 (diff) | |
| parent | e3367fad368660bf40db29a82237475a9f2dfdbd (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 3 |
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")) { |