diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-08-12 19:35:20 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-08-12 19:35:20 +0300 |
| commit | 457e06e9e764b27ce6f4f8bd97882a5b32f45dc7 (patch) | |
| tree | ed3368365f733f439a7dcc4139cf3c030a518870 /indra/newview | |
| parent | 5eba8063a7dfdde77b4e3c8054c51ab91b96dd70 (diff) | |
MAINT-2883 FIXED World Map - Land For Sale is missing L$ / sqm
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llworldmap.cpp | 7 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llworldmap.cpp b/indra/newview/llworldmap.cpp index 5fa380e0e3..fd9cdd95a3 100755 --- a/indra/newview/llworldmap.cpp +++ b/indra/newview/llworldmap.cpp @@ -518,10 +518,17 @@ bool LLWorldMap::insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID& case MAP_ITEM_LAND_FOR_SALE: // land for sale case MAP_ITEM_LAND_FOR_SALE_ADULT: // adult land for sale { + F32 cost_per_sqm = 0.0f; + if ((F32)extra > 0) + { + cost_per_sqm = (F32)extra2 / (F32)extra; + } + static LLUIString tooltip_fmt = LLTrans::getString("worldmap_item_tooltip_format"); tooltip_fmt.setArg("[AREA]", llformat("%d", extra)); tooltip_fmt.setArg("[PRICE]", llformat("%d", extra2)); + tooltip_fmt.setArg("[PRICE_PER_SQM]", llformat("%.1f", cost_per_sqm)); new_item.setTooltip(tooltip_fmt.getString()); if (type == MAP_ITEM_LAND_FOR_SALE) diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index fb1846860c..d4a37a9813 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -378,7 +378,7 @@ Please try logging in again in a minute.</string> <!-- world map --> <string name="texture_loading">Loading...</string> <string name="worldmap_offline">Offline</string> - <string name="worldmap_item_tooltip_format">[AREA] m² L$[PRICE]</string> + <string name="worldmap_item_tooltip_format">[AREA] m² L$[PRICE] (L$[PRICE_PER_SQM]/m²)</string> <string name="worldmap_results_none_found">None found.</string> <!-- animations uploading status codes --> |