diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-22 19:26:38 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-22 19:26:38 -0800 |
| commit | 7094921d1f235ff45cc5b3ef58b64c2812c8676f (patch) | |
| tree | 77dcfd49791dc7475bd14336547a8dab337242ca | |
| parent | ec7b3ea83929c7160540358d04fc40fcd372475d (diff) | |
| parent | f942ede38b12cecef954d67f52ff3416a7956a27 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index a08e77e3d8..c79a66892d 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -68,7 +68,6 @@ #include "llviewermedia.h" #include "llvoavatarself.h" #include "llviewermediafocus.h" -#include "llvovolume.h" #include "llworld.h" #include "llui.h" #include "llweb.h" @@ -630,14 +629,12 @@ 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; |