Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

prebuild-update
Melanie 2010-06-22 23:40:12 +01:00
commit 7db5262e35
1 changed files with 14 additions and 14 deletions

View File

@ -6516,15 +6516,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (cut.y > 1f) if (cut.y > 1f)
{ {
cut.y = 1f; cut.y = 1f;
} }
if (cut.y - cut.x < 0.05f) if (cut.y - cut.x < 0.05f)
{ {
cut.x = cut.y - 0.05f; cut.x = cut.y - 0.05f;
if (cut.x < 0.0f) if (cut.x < 0.0f)
{ {
cut.x = 0.0f; cut.x = 0.0f;
cut.y = 0.05f; cut.y = 0.05f;
} }
} }
shapeBlock.ProfileBegin = (ushort)(50000 * cut.x); shapeBlock.ProfileBegin = (ushort)(50000 * cut.x);
shapeBlock.ProfileEnd = (ushort)(50000 * (1 - cut.y)); shapeBlock.ProfileEnd = (ushort)(50000 * (1 - cut.y));
@ -6722,11 +6722,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
if (profilecut.y - profilecut.x < 0.05f) if (profilecut.y - profilecut.x < 0.05f)
{ {
profilecut.x = profilecut.y - 0.05f; profilecut.x = profilecut.y - 0.05f;
if (profilecut.x < 0.0f) if (profilecut.x < 0.0f)
{ {
profilecut.x = 0.0f; profilecut.x = 0.0f;
profilecut.y = 0.05f; profilecut.y = 0.05f;
} }
} }
shapeBlock.ProfileBegin = (ushort)(50000 * profilecut.x); shapeBlock.ProfileBegin = (ushort)(50000 * profilecut.x);