diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-10-28 20:06:18 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-10-28 20:06:18 -0400 |
| commit | 57040ea70e21ea5cfaedfd8a3506362a03562552 (patch) | |
| tree | eb9dc090ab72bea2353de8a940ccdc7ab69d830e /indra/newview/llworldmap.cpp | |
| parent | 8881b47d22a7cd17824e8162e0658af71bbe3dea (diff) | |
| parent | d5877bc365292358eb4c9b8d14d1c8a1237ca5bd (diff) | |
Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3331
Diffstat (limited to 'indra/newview/llworldmap.cpp')
| -rwxr-xr-x | indra/newview/llworldmap.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llworldmap.cpp b/indra/newview/llworldmap.cpp index 5fa380e0e3..bfae142812 100755 --- a/indra/newview/llworldmap.cpp +++ b/indra/newview/llworldmap.cpp @@ -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("[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()); if (type == MAP_ITEM_LAND_FOR_SALE) |