aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World
diff options
context:
space:
mode:
authorUbitUmarov2019-07-06 20:49:00 +0100
committerUbitUmarov2019-07-06 20:49:00 +0100
commitd372309e3cb3407e54b49e4da6fd3296f150b84d (patch)
tree3d2d48996111ef6a309b2695bbe169d03f14d6b0 /OpenSim/Region/CoreModules/World
parentreduce httptimout on first try to save a asset to grid (diff)
downloadopensim-SC-d372309e3cb3407e54b49e4da6fd3296f150b84d.zip
opensim-SC-d372309e3cb3407e54b49e4da6fd3296f150b84d.tar.gz
opensim-SC-d372309e3cb3407e54b49e4da6fd3296f150b84d.tar.bz2
opensim-SC-d372309e3cb3407e54b49e4da6fd3296f150b84d.tar.xz
mantis 8558: send sane values for Agents and objects capability (max hard limit)
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 936f956..986a44f 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -1404,7 +1404,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
1404 RegionInfoForEstateMenuArgs args = new RegionInfoForEstateMenuArgs(); 1404 RegionInfoForEstateMenuArgs args = new RegionInfoForEstateMenuArgs();
1405 args.billableFactor = Scene.RegionInfo.EstateSettings.BillableFactor; 1405 args.billableFactor = Scene.RegionInfo.EstateSettings.BillableFactor;
1406 args.estateID = Scene.RegionInfo.EstateSettings.EstateID; 1406 args.estateID = Scene.RegionInfo.EstateSettings.EstateID;
1407 args.maxAgents = (byte)Scene.RegionInfo.RegionSettings.AgentLimit; 1407 args.maxAgents = Scene.RegionInfo.RegionSettings.AgentLimit;
1408 args.objectBonusFactor = (float)Scene.RegionInfo.RegionSettings.ObjectBonus; 1408 args.objectBonusFactor = (float)Scene.RegionInfo.RegionSettings.ObjectBonus;
1409 args.parentEstateID = Scene.RegionInfo.EstateSettings.ParentEstateID; 1409 args.parentEstateID = Scene.RegionInfo.EstateSettings.ParentEstateID;
1410 args.pricePerMeter = Scene.RegionInfo.EstateSettings.PricePerMeter; 1410 args.pricePerMeter = Scene.RegionInfo.EstateSettings.PricePerMeter;
@@ -1419,6 +1419,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
1419 args.waterHeight = (float)Scene.RegionInfo.RegionSettings.WaterHeight; 1419 args.waterHeight = (float)Scene.RegionInfo.RegionSettings.WaterHeight;
1420 args.simName = Scene.RegionInfo.RegionName; 1420 args.simName = Scene.RegionInfo.RegionName;
1421 args.regionType = Scene.RegionInfo.RegionType; 1421 args.regionType = Scene.RegionInfo.RegionType;
1422 args.AgentCapacity = Scene.RegionInfo.AgentCapacity;
1423 args.ObjectsCapacity = Scene.RegionInfo.ObjectCapacity;
1422 1424
1423 remote_client.SendRegionInfoToEstateMenu(args); 1425 remote_client.SendRegionInfoToEstateMenu(args);
1424 } 1426 }