merge changes for 5.0.1-release

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/newview/llfloaterobjectweights.cpp b/indra/newview/llfloaterobjectweights.cpp
index feaeef4ad0..ed1ad4426f 100644
--- a/indra/newview/llfloaterobjectweights.cpp
+++ b/indra/newview/llfloaterobjectweights.cpp
@@ -145,6 +145,14 @@ void LLFloaterObjectWeights::updateLandImpacts(const LLParcel* parcel)
 	{
 		S32 rezzed_prims = parcel->getSimWidePrimCount();
 		S32 total_capacity = parcel->getSimWideMaxPrimCapacity();
+		// Can't have more than region max tasks, regardless of parcel
+		// object bonus factor.
+		LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
+		if (region)
+		{
+			S32 max_tasks_per_region = (S32)region->getMaxTasks();
+			total_capacity = llmin(total_capacity, max_tasks_per_region);
+		}
 
 		mRezzedOnLand->setText(llformat("%d", rezzed_prims));
 		mRemainingCapacity->setText(llformat("%d", total_capacity - rezzed_prims));