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

Refine autoreturn a bit

avinationmerge
Melanie Thielker 2010-07-21 12:16:17 +02:00
parent 4ccc141764
commit c72c84b455
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -1681,7 +1681,10 @@ namespace OpenSim.Region.Framework.Scenes
try try
{ {
if (!m_scene.ShuttingDown) // if shutting down then there will be nothing to handle the return so leave till next restart if (!m_scene.ShuttingDown || // if shutting down then there will be nothing to handle the return so leave till next restart
m_scene.LoginsDisabled || // We're starting up or doing maintenance, don't mess with things
m_scene.LoadingPrims) // Land may not be valid yet
{ {
ILandObject parcel = m_scene.LandChannel.GetLandObject( ILandObject parcel = m_scene.LandChannel.GetLandObject(
m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y); m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);

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

@ -6348,16 +6348,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
prules.OuterAngle = (float)tempf; prules.OuterAngle = (float)tempf;
prules.PartFlags |= 0x02; // Set new angle format. prules.PartFlags |= 0x02; // Set new angle format.
break; break;
case (int)ScriptBaseClass.PSYS_SRC_INNERANGLE:
tempf = (float)rules.GetLSLFloatItem(i + 1);
prules.InnerAngle = (float)tempf;
break;
case (int)ScriptBaseClass.PSYS_SRC_OUTERANGLE:
tempf = (float)rules.GetLSLFloatItem(i + 1);
prules.OuterAngle = (float)tempf;
break;
} }
} }