diff options
author | prep <prep@lindenlab.com> | 2013-03-11 14:45:53 -0400 |
---|---|---|
committer | prep <prep@lindenlab.com> | 2013-03-11 14:45:53 -0400 |
commit | 207d9fd767895a3470722fb298eeef4f338e479a (patch) | |
tree | 050b5c2c1d88b910aeebe8c8be04c19f548bb123 /indra/newview/lltoolpie.cpp | |
parent | 82c92ce5a97d6a83505c775348aef692e18e42ed (diff) | |
parent | fe042430b03667abcd6b72ef9cc27d82d85f4242 (diff) |
Viewer-chui merge
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
-rw-r--r-- | indra/newview/lltoolpie.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index f24891baf6..fc9a316759 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -791,14 +791,10 @@ BOOL LLToolPie::handleTooltipLand(std::string line, std::string tooltip_msg) LLParcel* hover_parcel = LLViewerParcelMgr::getInstance()->getHoverParcel(); LLUUID owner; - S32 width = 0; - S32 height = 0; if ( hover_parcel ) { owner = hover_parcel->getOwnerID(); - width = S32(LLViewerParcelMgr::getInstance()->getHoverParcelWidth()); - height = S32(LLViewerParcelMgr::getInstance()->getHoverParcelHeight()); } // Line: "Land" @@ -1593,9 +1589,6 @@ BOOL LLToolPie::handleRightClickPick() // didn't click in any UI object, so must have clicked in the world LLViewerObject *object = mPick.getObject(); - LLViewerObject *parent = NULL; - if(object) - parent = object->getRootEdit(); // Can't ignore children here. LLToolSelect::handleObjectSelection(mPick, FALSE, TRUE); |