diff options
| author | thickbrick | 2011-04-05 23:11:32 +0300 |
|---|---|---|
| committer | thickbrick | 2011-04-05 23:11:32 +0300 |
| commit | 3836ce9ba6872555494e434878fdc6f489a5f1d6 (patch) | |
| tree | 7c11f5aabac23cee19002d36c5bafa6e1a8688c0 /linden/indra/newview | |
| parent | Changed version to Experimental 2011.04.02. (diff) | |
| download | meta-impy-3836ce9ba6872555494e434878fdc6f489a5f1d6.zip meta-impy-3836ce9ba6872555494e434878fdc6f489a5f1d6.tar.gz meta-impy-3836ce9ba6872555494e434878fdc6f489a5f1d6.tar.bz2 meta-impy-3836ce9ba6872555494e434878fdc6f489a5f1d6.tar.xz | |
Fix #846: Crash when double-clicking system tree
Diffstat (limited to 'linden/indra/newview')
| -rw-r--r-- | linden/indra/newview/lltoolpie.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp index b7d762c..dbb5b63 100644 --- a/linden/indra/newview/lltoolpie.cpp +++ b/linden/indra/newview/lltoolpie.cpp | |||
| @@ -802,8 +802,8 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask) | |||
| 802 | } | 802 | } |
| 803 | 803 | ||
| 804 | const LLTextureEntry* tep = object->getTE(mPick.mObjectFace); | 804 | const LLTextureEntry* tep = object->getTE(mPick.mObjectFace); |
| 805 | viewer_media_t media_impl = LLViewerMedia::getMediaImplFromTextureID(tep->getID()); | 805 | viewer_media_t media_impl = tep ? LLViewerMedia::getMediaImplFromTextureID(tep->getID()) : NULL; |
| 806 | if (tep && media_impl.notNull() && media_impl->hasMedia()) | 806 | if (media_impl.notNull() && media_impl->hasMedia()) |
| 807 | { | 807 | { |
| 808 | LL_DEBUGS("DoubleClicks") << "Double clicked running parcel media" << LL_ENDL; | 808 | LL_DEBUGS("DoubleClicks") << "Double clicked running parcel media" << LL_ENDL; |
| 809 | return FALSE; | 809 | return FALSE; |