livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-2883 FIXED World Map - Land For Sale is missing L$ / sqm

meow-7.2.2
maksymsproductengine 2013-08-12 19:35:20 +03:00
parent 5eba8063a7
commit 457e06e9e7
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llworldmap.cpp
View File

@ -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)

2
indra/newview/skins/default/xui/en/strings.xml
View File

@ -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 -->