diff options
Diffstat (limited to 'linden/indra/newview/llpanelland.cpp')
-rw-r--r-- | linden/indra/newview/llpanelland.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llpanelland.cpp b/linden/indra/newview/llpanelland.cpp index 38eac5d..1b3e146 100644 --- a/linden/indra/newview/llpanelland.cpp +++ b/linden/indra/newview/llpanelland.cpp | |||
@@ -109,7 +109,7 @@ void LLPanelLandInfo::refreshAll() | |||
109 | // public | 109 | // public |
110 | void LLPanelLandInfo::refresh() | 110 | void LLPanelLandInfo::refresh() |
111 | { | 111 | { |
112 | LLParcel *parcel = gParcelMgr->getSelectedParcel(); | 112 | LLParcel *parcel = gParcelMgr->getParcelSelection()->getParcel(); |
113 | LLViewerRegion *regionp = gParcelMgr->getSelectionRegion(); | 113 | LLViewerRegion *regionp = gParcelMgr->getSelectionRegion(); |
114 | 114 | ||
115 | if (!parcel || !regionp) | 115 | if (!parcel || !regionp) |
@@ -177,7 +177,7 @@ void LLPanelLandInfo::refresh() | |||
177 | // and it must not be a whole parcel. | 177 | // and it must not be a whole parcel. |
178 | if (gParcelMgr->getSelectedArea() > PARCEL_UNIT_AREA | 178 | if (gParcelMgr->getSelectedArea() > PARCEL_UNIT_AREA |
179 | //&& gParcelMgr->getSelfCount() > 1 | 179 | //&& gParcelMgr->getSelfCount() > 1 |
180 | && !gParcelMgr->getWholeParcelSelected()) | 180 | && !gParcelMgr->getParcelSelection()->getWholeParcelSelected()) |
181 | { | 181 | { |
182 | childSetEnabled("button join land",TRUE); | 182 | childSetEnabled("button join land",TRUE); |
183 | } | 183 | } |
@@ -200,7 +200,7 @@ void LLPanelLandInfo::refresh() | |||
200 | &rent_price, | 200 | &rent_price, |
201 | &for_sale, | 201 | &for_sale, |
202 | &dwell); | 202 | &dwell); |
203 | if(is_public || (is_for_sale && gParcelMgr->getWholeParcelSelected())) | 203 | if(is_public || (is_for_sale && gParcelMgr->getParcelSelection()->getWholeParcelSelected())) |
204 | { | 204 | { |
205 | childSetTextArg("label_area_price","[PRICE]", llformat("%d",claim_price)); | 205 | childSetTextArg("label_area_price","[PRICE]", llformat("%d",claim_price)); |
206 | childSetTextArg("label_area_price","[AREA]", llformat("%d",area)); | 206 | childSetTextArg("label_area_price","[AREA]", llformat("%d",area)); |
@@ -246,7 +246,7 @@ void LLPanelLandInfo::onClickJoin(void*) | |||
246 | void LLPanelLandInfo::onClickAbout(void*) | 246 | void LLPanelLandInfo::onClickAbout(void*) |
247 | { | 247 | { |
248 | // Promote the rectangle selection to a parcel selection | 248 | // Promote the rectangle selection to a parcel selection |
249 | if (!gParcelMgr->getWholeParcelSelected()) | 249 | if (!gParcelMgr->getParcelSelection()->getWholeParcelSelected()) |
250 | { | 250 | { |
251 | gParcelMgr->selectParcelInRectangle(); | 251 | gParcelMgr->selectParcelInRectangle(); |
252 | } | 252 | } |