diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-12 12:10:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-12 12:10:24 -0400 |
| commit | edf5b6a8b71d9c4c01ce9c975864d4525cd7350c (patch) | |
| tree | 68310a6824451c8c6f3af8ef73f2f9ec17c3a467 /indra/newview/lltoolpie.cpp | |
| parent | 01fb17cbc5a1d6a3526c4115787dbae74f7bdb07 (diff) | |
| parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) | |
pull changes for Sunshine beta
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); |