diff options
| author | Melanie Thielker | 2017-03-31 14:50:14 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2017-03-31 14:50:14 +0100 |
| commit | 5587ee45005bd99ee01cefd8fb3ae3f2b91bf284 (patch) | |
| tree | 2863324dc4f7832d60c22118268b8a432fb7c1bf /OpenSim/Region/ScriptEngine | |
| parent | add CanSellObject() permitions check functions (diff) | |
| parent | If a DNS resolution fails on an outbound request, simply allow it (diff) | |
| download | opensim-SC_OLD-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.zip opensim-SC_OLD-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.tar.gz opensim-SC_OLD-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.tar.bz2 opensim-SC_OLD-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.tar.xz | |
Merge branch 'melanie'
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 3f2e321..62654ee 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -424,6 +424,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 424 | return lease; | 424 | return lease; |
| 425 | } | 425 | } |
| 426 | 426 | ||
| 427 | protected SceneObjectPart MonitoringObject() | ||
| 428 | { | ||
| 429 | UUID m = m_host.ParentGroup.MonitoringObject; | ||
| 430 | if (m == UUID.Zero) | ||
| 431 | return null; | ||
| 432 | |||
| 433 | SceneObjectPart p = m_ScriptEngine.World.GetSceneObjectPart(m); | ||
| 434 | if (p == null) | ||
| 435 | m_host.ParentGroup.MonitoringObject = UUID.Zero; | ||
| 436 | |||
| 437 | return p; | ||
| 438 | } | ||
| 439 | |||
| 427 | protected virtual void ScriptSleep(int delay) | 440 | protected virtual void ScriptSleep(int delay) |
| 428 | { | 441 | { |
| 429 | delay = (int)((float)delay * m_ScriptDelayFactor); | 442 | delay = (int)((float)delay * m_ScriptDelayFactor); |