Skip to content
Snippets Groups Projects
Commit 22a931ef authored by Jonathan Yap's avatar Jonathan Yap
Browse files

STORM-1957 World Map - Land For Sale is missing L$ / sqm

parent 6060e5e4
No related branches found
No related tags found
No related merge requests found
...@@ -649,6 +649,7 @@ Jonathan Yap ...@@ -649,6 +649,7 @@ Jonathan Yap
STORM-1858 STORM-1858
STORM-1862 STORM-1862
OPEN-161 OPEN-161
STORM-1957
Kadah Coba Kadah Coba
STORM-1060 STORM-1060
STORM-1843 STORM-1843
......
...@@ -522,6 +522,17 @@ bool LLWorldMap::insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID& ...@@ -522,6 +522,17 @@ bool LLWorldMap::insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID&
tooltip_fmt.setArg("[AREA]", llformat("%d", extra)); tooltip_fmt.setArg("[AREA]", llformat("%d", extra));
tooltip_fmt.setArg("[PRICE]", llformat("%d", extra2)); tooltip_fmt.setArg("[PRICE]", llformat("%d", extra2));
// Check for division by zero
if (extra != 0)
{
tooltip_fmt.setArg("[SQMPRICE]", llformat("%.1f", (F32)extra2 / (F32)extra));
}
else
{
tooltip_fmt.setArg("[SQMPRICE]", LLTrans::getString("Unknown"));
}
new_item.setTooltip(tooltip_fmt.getString()); new_item.setTooltip(tooltip_fmt.getString());
if (type == MAP_ITEM_LAND_FOR_SALE) if (type == MAP_ITEM_LAND_FOR_SALE)
......
...@@ -378,7 +378,7 @@ Please try logging in again in a minute.</string> ...@@ -378,7 +378,7 @@ Please try logging in again in a minute.</string>
<!-- world map --> <!-- world map -->
<string name="texture_loading">Loading...</string> <string name="texture_loading">Loading...</string>
<string name="worldmap_offline">Offline</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] ([SQMPRICE] L$/m²)</string>
<string name="worldmap_results_none_found">None found.</string> <string name="worldmap_results_none_found">None found.</string>
<!-- animations uploading status codes --> <!-- animations uploading status codes -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment