aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs8
-rw-r--r--OpenSim/Framework/WebUtil.cs4
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 96d78d3..98d1bdd 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -348,7 +348,7 @@ namespace OpenSim.Framework
348 case 2: // torus with hollow (a sl viewer whould see 4 faces on a hollow sphere) 348 case 2: // torus with hollow (a sl viewer whould see 4 faces on a hollow sphere)
349 shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle; 349 shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle;
350 shape.PathCurve = (byte)Extrusion.Curve1; 350 shape.PathCurve = (byte)Extrusion.Curve1;
351 shape.ProfileHollow = 1; 351 shape.ProfileHollow = 27500;
352 break; 352 break;
353 353
354 case 3: // cylinder 354 case 3: // cylinder
@@ -359,7 +359,7 @@ namespace OpenSim.Framework
359 case 4: // cylinder with hollow 359 case 4: // cylinder with hollow
360 shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle; 360 shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle;
361 shape.PathCurve = (byte)Extrusion.Straight; 361 shape.PathCurve = (byte)Extrusion.Straight;
362 shape.ProfileHollow = 1; 362 shape.ProfileHollow = 27500;
363 break; 363 break;
364 364
365 case 5: // prism 365 case 5: // prism
@@ -375,13 +375,13 @@ namespace OpenSim.Framework
375 case 7: // box with hollow 375 case 7: // box with hollow
376 shape.ProfileCurve = (byte)ProfileShape.Square | (byte)HollowShape.Triangle; 376 shape.ProfileCurve = (byte)ProfileShape.Square | (byte)HollowShape.Triangle;
377 shape.PathCurve = (byte)Extrusion.Straight; 377 shape.PathCurve = (byte)Extrusion.Straight;
378 shape.ProfileHollow = 1; 378 shape.ProfileHollow = 27500;
379 break; 379 break;
380 380
381 default: // 8 faces box with cut 381 default: // 8 faces box with cut
382 shape.ProfileCurve = (byte)ProfileShape.Square | (byte)HollowShape.Triangle; 382 shape.ProfileCurve = (byte)ProfileShape.Square | (byte)HollowShape.Triangle;
383 shape.PathCurve = (byte)Extrusion.Straight; 383 shape.PathCurve = (byte)Extrusion.Straight;
384 shape.ProfileBegin = 1; 384 shape.ProfileBegin = 12500;
385 break; 385 break;
386 } 386 }
387 387
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 48078ad..20d30b5 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Framework
200 request.Timeout = timeout; 200 request.Timeout = timeout;
201 request.KeepAlive = false; 201 request.KeepAlive = false;
202 request.MaximumAutomaticRedirections = 10; 202 request.MaximumAutomaticRedirections = 10;
203 request.ReadWriteTimeout = timeout / 4; 203 request.ReadWriteTimeout = timeout / 2;
204 request.Headers[OSHeaderRequestID] = reqnum.ToString(); 204 request.Headers[OSHeaderRequestID] = reqnum.ToString();
205 205
206 // If there is some input, write it into the request 206 // If there is some input, write it into the request
@@ -396,7 +396,7 @@ namespace OpenSim.Framework
396 request.Timeout = timeout; 396 request.Timeout = timeout;
397 request.KeepAlive = false; 397 request.KeepAlive = false;
398 request.MaximumAutomaticRedirections = 10; 398 request.MaximumAutomaticRedirections = 10;
399 request.ReadWriteTimeout = timeout / 4; 399 request.ReadWriteTimeout = timeout / 2;
400 request.Headers[OSHeaderRequestID] = reqnum.ToString(); 400 request.Headers[OSHeaderRequestID] = reqnum.ToString();
401 401
402 if (data != null) 402 if (data != null)