aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorUbitUmarov2017-01-20 23:36:35 +0000
committerUbitUmarov2017-01-20 23:36:35 +0000
commit48f137599f5930611e2ade0f1c64fc3a6b188f75 (patch)
tree0fc013efc0aa984375687c10c00cba945912538c /OpenSim/Region/OptionalModules
parenttest jenkins (diff)
downloadopensim-SC_OLD-48f137599f5930611e2ade0f1c64fc3a6b188f75.zip
opensim-SC_OLD-48f137599f5930611e2ade0f1c64fc3a6b188f75.tar.gz
opensim-SC_OLD-48f137599f5930611e2ade0f1c64fc3a6b188f75.tar.bz2
opensim-SC_OLD-48f137599f5930611e2ade0f1c64fc3a6b188f75.tar.xz
fix a null ref on jenkins
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs10
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
index 9c0d801..744e260 100644
--- a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
+++ b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
@@ -139,8 +139,8 @@ namespace OpenSim.Region.OptionalModules
139 { 139 {
140 float newX = newPoint.X; 140 float newX = newPoint.X;
141 float newY = newPoint.Y; 141 float newY = newPoint.Y;
142 if (newX < -1f || newX > (scene.RegionInfo.RegionSizeX + 1.0f) || 142 if (newX < -1.0f || newX > (scene.RegionInfo.RegionSizeX + 1.0f) ||
143 newY < -1f || newY > (scene.RegionInfo.RegionSizeY + 1.0f) ) 143 newY < -1.0f || newY > (scene.RegionInfo.RegionSizeY + 1.0f) )
144 return true; 144 return true;
145 145
146 if (sog == null) 146 if (sog == null)
@@ -160,14 +160,12 @@ namespace OpenSim.Region.OptionalModules
160 } 160 }
161 161
162 int objectCount = sog.PrimCount; 162 int objectCount = sog.PrimCount;
163 int usedPrims = newParcel.PrimCounts.Total;
164 int simulatorCapacity = newParcel.GetSimulatorMaxPrimCount();
165 163
166 // TODO: Add Special Case here for temporary prims 164 // TODO: Add Special Case here for temporary prims
167 165
168 string response = DoCommonChecks(objectCount, sog.OwnerID, newParcel, scene); 166 string response = DoCommonChecks(objectCount, sog.OwnerID, newParcel, scene);
169 167
170 if (response != null) 168 if (response != null && m_dialogModule != null)
171 { 169 {
172 m_dialogModule.SendAlertToUser(sog.OwnerID, response); 170 m_dialogModule.SendAlertToUser(sog.OwnerID, response);
173 return false; 171 return false;
@@ -182,7 +180,7 @@ namespace OpenSim.Region.OptionalModules
182 int OwnedParcelsCapacity = lo.GetSimulatorMaxPrimCount(); 180 int OwnedParcelsCapacity = lo.GetSimulatorMaxPrimCount();
183 if ((objectCount + lo.PrimCounts.Total) > OwnedParcelsCapacity) 181 if ((objectCount + lo.PrimCounts.Total) > OwnedParcelsCapacity)
184 { 182 {
185 response = "Unable to rez object because the parcel is too full"; 183 response = "Unable to rez object because the region is too full";
186 } 184 }
187 else 185 else
188 { 186 {