From 3836ce9ba6872555494e434878fdc6f489a5f1d6 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Tue, 5 Apr 2011 23:11:32 +0300
Subject: Fix #846: Crash when double-clicking system tree
---
linden/indra/newview/lltoolpie.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'linden')
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)
}
const LLTextureEntry* tep = object->getTE(mPick.mObjectFace);
- viewer_media_t media_impl = LLViewerMedia::getMediaImplFromTextureID(tep->getID());
- if (tep && media_impl.notNull() && media_impl->hasMedia())
+ viewer_media_t media_impl = tep ? LLViewerMedia::getMediaImplFromTextureID(tep->getID()) : NULL;
+ if (media_impl.notNull() && media_impl->hasMedia())
{
LL_DEBUGS("DoubleClicks") << "Double clicked running parcel media" << LL_ENDL;
return FALSE;
--
cgit v1.1