aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs10
2 files changed, 4 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 7053c02..e738dd2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1681,7 +1681,10 @@ namespace OpenSim.Region.Framework.Scenes
1681 1681
1682 try 1682 try
1683 { 1683 {
1684 if (!m_scene.ShuttingDown) // if shutting down then there will be nothing to handle the return so leave till next restart 1684 if (!m_scene.ShuttingDown || // if shutting down then there will be nothing to handle the return so leave till next restart
1685 m_scene.LoginsDisabled || // We're starting up or doing maintenance, don't mess with things
1686 m_scene.LoadingPrims) // Land may not be valid yet
1687
1685 { 1688 {
1686 ILandObject parcel = m_scene.LandChannel.GetLandObject( 1689 ILandObject parcel = m_scene.LandChannel.GetLandObject(
1687 m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y); 1690 m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 1d4c235..a6f0cdd 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6348,16 +6348,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6348 prules.OuterAngle = (float)tempf; 6348 prules.OuterAngle = (float)tempf;
6349 prules.PartFlags |= 0x02; // Set new angle format. 6349 prules.PartFlags |= 0x02; // Set new angle format.
6350 break; 6350 break;
6351
6352 case (int)ScriptBaseClass.PSYS_SRC_INNERANGLE:
6353 tempf = (float)rules.GetLSLFloatItem(i + 1);
6354 prules.InnerAngle = (float)tempf;
6355 break;
6356
6357 case (int)ScriptBaseClass.PSYS_SRC_OUTERANGLE:
6358 tempf = (float)rules.GetLSLFloatItem(i + 1);
6359 prules.OuterAngle = (float)tempf;
6360 break;
6361 } 6351 }
6362 6352
6363 } 6353 }