From 26511f5b87dac96f6f06f36c13806707b332153d Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 13 Dec 2016 11:59:53 +0200
Subject: MAINT-6994 Viewer still reports remaining capacity incorrectly during
 the presence of an region object bonus.

---
 indra/newview/llfloatertools.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

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();
-- 
cgit v1.2.3