diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-12-13 11:59:53 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-12-13 11:59:53 +0200 |
| commit | 26511f5b87dac96f6f06f36c13806707b332153d (patch) | |
| tree | a4419eebc19f16ed2c914cb242d409af0d1d558e /indra/newview | |
| parent | 8937802340c139947653ab2276217040444eba9e (diff) | |
MAINT-6994 Viewer still reports remaining capacity incorrectly during the presence of an region object bonus.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 987a7449ee..b14b9b7578 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -1177,7 +1177,12 @@ void LLFloaterTools::updateLandImpacts() S32 rezzed_prims = parcel->getSimWidePrimCount(); S32 total_capacity = parcel->getSimWideMaxPrimCapacity(); - + LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion(); + if (region) + { + S32 max_tasks_per_region = (S32)region->getMaxTasks(); + total_capacity = llmin(total_capacity, max_tasks_per_region); + } std::string remaining_capacity_str = ""; bool show_mesh_cost = gMeshRepo.meshRezEnabled(); |