diff options
| author | Justin Clark-Casey (justincc) | 2014-01-17 01:58:10 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-01-17 01:58:10 +0000 |
| commit | 14c72d4a5bba73c10bd4a5d93d53cd4fc0398570 (patch) | |
| tree | 7f2c8b577c2d4354b1d6873eb90759ba46379c24 | |
| parent | minor: Add Ai Austin to additional OpenSim contributors by request as he has ... (diff) | |
| download | opensim-SC_OLD-14c72d4a5bba73c10bd4a5d93d53cd4fc0398570.zip opensim-SC_OLD-14c72d4a5bba73c10bd4a5d93d53cd4fc0398570.tar.gz opensim-SC_OLD-14c72d4a5bba73c10bd4a5d93d53cd4fc0398570.tar.bz2 opensim-SC_OLD-14c72d4a5bba73c10bd4a5d93d53cd4fc0398570.tar.xz | |
Revert "Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene"
This reverts commit 39e5785c0f5bfa9fce2549757ac895920c88825a.
Did not mean to apply this yet.
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs index 30eed40..1d6cb6d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs | |||
| @@ -446,9 +446,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 446 | LSShoutError("LightShare functions are not enabled."); | 446 | LSShoutError("LightShare functions are not enabled."); |
| 447 | return 0; | 447 | return 0; |
| 448 | } | 448 | } |
| 449 | 449 | if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200) | |
| 450 | ScenePresence sp = World.GetScenePresence(m_host.OwnerID); | ||
| 451 | if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && (sp == null || sp.GodLevel < 200)) | ||
| 452 | { | 450 | { |
| 453 | LSShoutError("lsSetWindlightScene can only be used by estate managers or owners."); | 451 | LSShoutError("lsSetWindlightScene can only be used by estate managers or owners."); |
| 454 | return 0; | 452 | return 0; |
| @@ -476,9 +474,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 476 | LSShoutError("LightShare functions are not enabled."); | 474 | LSShoutError("LightShare functions are not enabled."); |
| 477 | return; | 475 | return; |
| 478 | } | 476 | } |
| 479 | 477 | if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200) | |
| 480 | ScenePresence sp = World.GetScenePresence(m_host.OwnerID); | ||
| 481 | if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && (sp == null || sp.GodLevel < 200)) | ||
| 482 | { | 478 | { |
| 483 | LSShoutError("lsSetWindlightScene can only be used by estate managers or owners."); | 479 | LSShoutError("lsSetWindlightScene can only be used by estate managers or owners."); |
| 484 | return; | 480 | return; |
| @@ -501,9 +497,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 501 | LSShoutError("LightShare functions are not enabled."); | 497 | LSShoutError("LightShare functions are not enabled."); |
| 502 | return 0; | 498 | return 0; |
| 503 | } | 499 | } |
| 504 | 500 | if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200) | |
| 505 | ScenePresence sp = World.GetScenePresence(m_host.OwnerID); | ||
| 506 | if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && (sp == null || sp.GodLevel < 200)) | ||
| 507 | { | 501 | { |
| 508 | LSShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners."); | 502 | LSShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners."); |
| 509 | return 0; | 503 | return 0; |