aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolselectland.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lltoolselectland.cpp')
-rw-r--r--linden/indra/newview/lltoolselectland.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/linden/indra/newview/lltoolselectland.cpp b/linden/indra/newview/lltoolselectland.cpp
index 11943cc..96e0de1 100644
--- a/linden/indra/newview/lltoolselectland.cpp
+++ b/linden/indra/newview/lltoolselectland.cpp
@@ -46,9 +46,6 @@
46#include "llviewerparcelmgr.h" 46#include "llviewerparcelmgr.h"
47#include "llviewerwindow.h" 47#include "llviewerwindow.h"
48 48
49// Globals
50LLToolSelectLand *gToolParcel = NULL;
51
52// 49//
53// Member functions 50// Member functions
54// 51//
@@ -98,7 +95,7 @@ BOOL LLToolSelectLand::handleMouseDown(S32 x, S32 y, MASK mask)
98 95
99 mMouseOutsideSlop = TRUE; //FALSE; 96 mMouseOutsideSlop = TRUE; //FALSE;
100 97
101 gParcelMgr->deselectLand(); 98 LLViewerParcelMgr::getInstance()->deselectLand();
102 } 99 }
103 100
104 return hit_land; 101 return hit_land;
@@ -112,7 +109,7 @@ BOOL LLToolSelectLand::handleDoubleClick(S32 x, S32 y, MASK mask)
112 if (hit_land) 109 if (hit_land)
113 { 110 {
114 // Auto-select this parcel 111 // Auto-select this parcel
115 gParcelMgr->selectParcelAt( pos_global ); 112 LLViewerParcelMgr::getInstance()->selectParcelAt( pos_global );
116 return TRUE; 113 return TRUE;
117 } 114 }
118 return FALSE; 115 return FALSE;
@@ -140,7 +137,7 @@ BOOL LLToolSelectLand::handleMouseUp(S32 x, S32 y, MASK mask)
140 roundXY(mEastNorthTop); 137 roundXY(mEastNorthTop);
141 138
142 // Don't auto-select entire parcel. 139 // Don't auto-select entire parcel.
143 mSelection = gParcelMgr->selectLand( mWestSouthBottom, mEastNorthTop, FALSE ); 140 mSelection = LLViewerParcelMgr::getInstance()->selectLand( mWestSouthBottom, mEastNorthTop, FALSE );
144 } 141 }
145 142
146 mMouseOutsideSlop = FALSE; 143 mMouseOutsideSlop = FALSE;
@@ -212,7 +209,7 @@ void LLToolSelectLand::render()
212{ 209{
213 if( hasMouseCapture() && /*mMouseOutsideSlop &&*/ mDragEndValid) 210 if( hasMouseCapture() && /*mMouseOutsideSlop &&*/ mDragEndValid)
214 { 211 {
215 gParcelMgr->renderRect( mWestSouthBottom, mEastNorthTop ); 212 LLViewerParcelMgr::getInstance()->renderRect( mWestSouthBottom, mEastNorthTop );
216 } 213 }
217} 214}
218 215
@@ -228,7 +225,7 @@ void LLToolSelectLand::handleDeselect()
228{ 225{
229 mSelection = NULL; 226 mSelection = NULL;
230 mLastShowParcelOwners = gSavedSettings.getBOOL("ShowParcelOwners"); 227 mLastShowParcelOwners = gSavedSettings.getBOOL("ShowParcelOwners");
231 //gParcelMgr->deselectLand(); 228 //LLViewerParcelMgr::getInstance()->deselectLand();
232 gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners); 229 gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners);
233} 230}
234 231