diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-01 23:10:05 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-01 23:10:05 +0000 |
| commit | 0f00eef21798520bcfe27ae03b3f1b2ae938ff13 (patch) | |
| tree | 81c5b33e296d316a10a76c5a9e4cd09790aaa029 /indra/newview/llfloaterlandholdings.cpp | |
| parent | ef0eb8dbcf3980a057ad0864efa1c8e1575a8428 (diff) | |
svn merge -r 71509:72877 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release
Backport patches and translations from RC branch
Diffstat (limited to 'indra/newview/llfloaterlandholdings.cpp')
| -rw-r--r-- | indra/newview/llfloaterlandholdings.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/indra/newview/llfloaterlandholdings.cpp b/indra/newview/llfloaterlandholdings.cpp index 5aac949f20..bccabb356f 100644 --- a/indra/newview/llfloaterlandholdings.cpp +++ b/indra/newview/llfloaterlandholdings.cpp @@ -116,8 +116,10 @@ BOOL LLFloaterLandHoldings::postBuild() element["columns"][0]["value"] = gAgent.mGroups.get(i).mName; element["columns"][0]["font"] = "SANSSERIF"; + LLUIString areastr = getUIString("area_string"); + areastr.setArg("[AREA]", llformat("%d", gAgent.mGroups.get(i).mContribution)); element["columns"][1]["column"] = "area"; - element["columns"][1]["value"] = llformat("%d sq. meters", gAgent.mGroups.get(i).mContribution); + element["columns"][1]["value"] = areastr; element["columns"][1]["font"] = "SANSSERIF"; list->addElement(element, ADD_SORTED); @@ -315,14 +317,7 @@ void LLFloaterLandHoldings::refreshAggregates() S32 current_area = gStatusBar->getSquareMetersCommitted(); S32 available_area = gStatusBar->getSquareMetersLeft(); - char buffer[MAX_STRING]; /* Flawfinder: ignore */ - - snprintf(buffer, MAX_STRING, "%d sq. meters", allowed_area); /* Flawfinder: ignore */ - childSetValue("allowed_text", LLSD(buffer)); - - snprintf(buffer, MAX_STRING, "%d sq. meters", current_area); /* Flawfinder: ignore */ - childSetValue("current_text", LLSD(buffer)); - - snprintf(buffer, MAX_STRING, "%d sq. meters", available_area); /* Flawfinder: ignore */ - childSetValue("available_text", LLSD(buffer)); + childSetTextArg("allowed_text", "[AREA]", llformat("%d",allowed_area)); + childSetTextArg("current_text", "[AREA]", llformat("%d",current_area)); + childSetTextArg("available_text", "[AREA]", llformat("%d",available_area)); } |