diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterbuyland.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/linden/indra/newview/llfloaterbuyland.cpp b/linden/indra/newview/llfloaterbuyland.cpp index f2a9fe2..29506e2 100644 --- a/linden/indra/newview/llfloaterbuyland.cpp +++ b/linden/indra/newview/llfloaterbuyland.cpp | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -213,7 +214,7 @@ void LLFloaterBuyLand::buyLand( | |||
213 | { | 214 | { |
214 | if(is_for_group && !gAgent.hasPowerInActiveGroup(GP_LAND_DEED)) | 215 | if(is_for_group && !gAgent.hasPowerInActiveGroup(GP_LAND_DEED)) |
215 | { | 216 | { |
216 | gViewerWindow->alertXml("OnlyOfficerCanBuyLand"); | 217 | LLNotifications::instance().add("OnlyOfficerCanBuyLand"); |
217 | return; | 218 | return; |
218 | } | 219 | } |
219 | 220 | ||
@@ -528,6 +529,12 @@ void LLFloaterBuyLandUI::updateCovenantInfo() | |||
528 | region_name->setText(region->getName()); | 529 | region_name->setText(region->getName()); |
529 | } | 530 | } |
530 | 531 | ||
532 | LLTextBox* region_type = getChild<LLTextBox>("region_type_text"); | ||
533 | if (region_type) | ||
534 | { | ||
535 | region_type->setText(region->getSimProductName()); | ||
536 | } | ||
537 | |||
531 | LLTextBox* resellable_clause = getChild<LLTextBox>("resellable_clause"); | 538 | LLTextBox* resellable_clause = getChild<LLTextBox>("resellable_clause"); |
532 | if (resellable_clause) | 539 | if (resellable_clause) |
533 | { | 540 | { |
@@ -976,7 +983,7 @@ BOOL LLFloaterBuyLandUI::canClose() | |||
976 | if (!can_close) | 983 | if (!can_close) |
977 | { | 984 | { |
978 | // explain to user why they can't do this, see DEV-9605 | 985 | // explain to user why they can't do this, see DEV-9605 |
979 | gViewerWindow->alertXml("CannotCloseFloaterBuyLand"); | 986 | LLNotifications::instance().add("CannotCloseFloaterBuyLand"); |
980 | } | 987 | } |
981 | return can_close; | 988 | return can_close; |
982 | } | 989 | } |
@@ -1167,7 +1174,7 @@ void LLFloaterBuyLandUI::refreshUI() | |||
1167 | else if (mParcelBillableArea == mParcelActualArea) | 1174 | else if (mParcelBillableArea == mParcelActualArea) |
1168 | { | 1175 | { |
1169 | LLStringUtil::format_map_t string_args; | 1176 | LLStringUtil::format_map_t string_args; |
1170 | string_args["[AMOUNT]"] = llformat("%d", mParcelActualArea); | 1177 | string_args["[AMOUNT]"] = llformat("%d ", mParcelActualArea); |
1171 | message += getString("parcel_meters", string_args); | 1178 | message += getString("parcel_meters", string_args); |
1172 | } | 1179 | } |
1173 | else | 1180 | else |
@@ -1176,13 +1183,13 @@ void LLFloaterBuyLandUI::refreshUI() | |||
1176 | if (mParcelBillableArea > mParcelActualArea) | 1183 | if (mParcelBillableArea > mParcelActualArea) |
1177 | { | 1184 | { |
1178 | LLStringUtil::format_map_t string_args; | 1185 | LLStringUtil::format_map_t string_args; |
1179 | string_args["[AMOUNT]"] = llformat("%d", mParcelBillableArea); | 1186 | string_args["[AMOUNT]"] = llformat("%d ", mParcelBillableArea); |
1180 | message += getString("premium_land", string_args); | 1187 | message += getString("premium_land", string_args); |
1181 | } | 1188 | } |
1182 | else | 1189 | else |
1183 | { | 1190 | { |
1184 | LLStringUtil::format_map_t string_args; | 1191 | LLStringUtil::format_map_t string_args; |
1185 | string_args["[AMOUNT]"] = llformat("%d", mParcelBillableArea); | 1192 | string_args["[AMOUNT]"] = llformat("%d ", mParcelBillableArea); |
1186 | message += getString("discounted_land", string_args); | 1193 | message += getString("discounted_land", string_args); |
1187 | } | 1194 | } |
1188 | } | 1195 | } |