livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-3201: bring up inspector tooltip if object has media

meow-7.2.2
Rick Pasetto 2010-01-06 13:21:49 -08:00
parent 7586d8fcfd
commit 5cd4fabccb
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/lltoolpie.cpp
View File

@ -68,6 +68,7 @@
#include "llviewermedia.h"
#include "llvoavatarself.h"
#include "llviewermediafocus.h"
#include "llvovolume.h"
#include "llworld.h"
#include "llui.h"
#include "llweb.h"
@ -629,12 +630,14 @@ static bool needs_tooltip(LLSelectNode* nodep)
return false;
LLViewerObject* object = nodep->getObject();
LLVOVolume* vovolume = dynamic_cast<LLVOVolume*>(object);
LLViewerObject *parent = (LLViewerObject *)object->getParent();
if (object->flagHandleTouch()
|| (parent && parent->flagHandleTouch())
|| object->flagTakesMoney()
|| (parent && parent->flagTakesMoney())
|| object->flagAllowInventoryAdd()
|| (vovolume && vovolume->hasMedia())
)
{
return true;