diff options
| author | Richard Linden <none@none> | 2010-02-17 17:02:26 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-02-17 17:02:26 -0800 |
| commit | cf52fc85ae4d06335a09b4dd60bddeb7f66841b3 (patch) | |
| tree | afa95f76e9ef3ebe9b91dce90d2a8671f28ab435 /indra/newview/lltoolpie.cpp | |
| parent | 7c86d4434822d7a3172bed82c3812032089c1518 (diff) | |
| parent | 9dfff8c6d2a54e3f6e069c26cc8753dc9331aec1 (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 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")) { |