diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/newview/llhoverview.cpp | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/newview/llhoverview.cpp')
| -rw-r--r-- | linden/indra/newview/llhoverview.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp index 4f248e4..91cb8a5 100644 --- a/linden/indra/newview/llhoverview.cpp +++ b/linden/indra/newview/llhoverview.cpp | |||
| @@ -546,14 +546,15 @@ void LLHoverView::updateText() | |||
| 546 | 546 | ||
| 547 | LLParcel* hover_parcel = LLViewerParcelMgr::getInstance()->getHoverParcel(); | 547 | LLParcel* hover_parcel = LLViewerParcelMgr::getInstance()->getHoverParcel(); |
| 548 | LLUUID owner; | 548 | LLUUID owner; |
| 549 | S32 width = 0; | 549 | // Their use is commented out below. No doubt both will get deleted on a later clean up pass. |
| 550 | S32 height = 0; | 550 | //S32 width = 0; |
| 551 | //S32 height = 0; | ||
| 551 | 552 | ||
| 552 | if ( hover_parcel ) | 553 | if ( hover_parcel ) |
| 553 | { | 554 | { |
| 554 | owner = hover_parcel->getOwnerID(); | 555 | owner = hover_parcel->getOwnerID(); |
| 555 | width = S32(LLViewerParcelMgr::getInstance()->getHoverParcelWidth()); | 556 | // width = S32(LLViewerParcelMgr::getInstance()->getHoverParcelWidth()); |
| 556 | height = S32(LLViewerParcelMgr::getInstance()->getHoverParcelHeight()); | 557 | // height = S32(LLViewerParcelMgr::getInstance()->getHoverParcelHeight()); |
| 557 | } | 558 | } |
| 558 | 559 | ||
| 559 | // Line: "Land" | 560 | // Line: "Land" |