diff options
| author | James Cook <james@lindenlab.com> | 2010-03-02 14:06:23 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-03-02 14:06:23 -0800 |
| commit | fe8d015851f74d375776791aa1adec204799037b (patch) | |
| tree | 644a0dfbd4cd750d69ccbf1a82fe1fc277842d2d /indra/newview/lltoolpie.cpp | |
| parent | 822d042e0c04dba2cdaced8c81b50840972a7286 (diff) | |
| parent | 96da7000e34585d24b4b6946a30a3fb77d668f76 (diff) | |
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 1ddf6db0e2..e345784f71 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -1280,11 +1280,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")) { |