OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

prebuild-update
Melanie 2010-06-19 23:48:09 +01:00
parent a3ebd4db3f c571c33b6b
commit 905e5cd991
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -6516,10 +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)
{
cut.x = 0.0f;
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));
@ -6715,9 +6720,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
profilecut.y = 1f; profilecut.y = 1f;
} }
if (profilecut.y - cut.x < 0.05f) if (profilecut.y - profilecut.x < 0.05f)
{ {
profilecut.x = cut.y - 0.05f; profilecut.x = profilecut.y - 0.05f;
if (profilecut.x < 0.0f)
{
profilecut.x = 0.0f;
profilecut.y = 0.05f;
}
} }
shapeBlock.ProfileBegin = (ushort)(50000 * profilecut.x); shapeBlock.ProfileBegin = (ushort)(50000 * profilecut.x);
shapeBlock.ProfileEnd = (ushort)(50000 * (1 - profilecut.y)); shapeBlock.ProfileEnd = (ushort)(50000 * (1 - profilecut.y));