diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-15 18:21:08 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-15 18:21:08 +0000 |
| commit | 7286516e9193e7549c9d8ecde65df85402443fab (patch) | |
| tree | 236b1c50e3f5ed5bfa85abb7d1d54cbc1a384d7b /indra/newview/lltoolpie.cpp | |
| parent | 1bb68d936de2657c3bce3bbe64947f043b5f7333 (diff) | |
| parent | 398af7dd40a060cf9ad8d799df03d448c2f53a96 (diff) | |
viewer2 merge
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")) { |