diff options
| author | UbitUmarov | 2016-12-04 23:39:15 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-04 23:39:15 +0000 |
| commit | 1680425f4d3ddd1c59d99daee23180d985f24d86 (patch) | |
| tree | 56c22c5773ec4663840b1dee0002c9f8dc9d5133 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |
| parent | update httpserver (diff) | |
| parent | HG: fix the never ending avatar confirmation when 2 users from same grid made... (diff) | |
| download | opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.zip opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.gz opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.bz2 opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index a21a0ca..19f2d09 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -4030,8 +4030,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 4030 | { | 4030 | { |
| 4031 | CheckThreatLevel(ThreatLevel.None, "osGetRezzingObject"); | 4031 | CheckThreatLevel(ThreatLevel.None, "osGetRezzingObject"); |
| 4032 | m_host.AddScriptLPS(1); | 4032 | m_host.AddScriptLPS(1); |
| 4033 | 4033 | UUID rezID = m_host.ParentGroup.RezzerID; | |
| 4034 | return new LSL_Key(m_host.ParentGroup.FromPartID.ToString()); | 4034 | if(rezID == UUID.Zero || m_host.ParentGroup.Scene.GetScenePresence(rezID) != null) |
| 4035 | return new LSL_Key(UUID.Zero.ToString()); | ||
| 4036 | return new LSL_Key(rezID.ToString()); | ||
| 4035 | } | 4037 | } |
| 4036 | 4038 | ||
| 4037 | /// <summary> | 4039 | /// <summary> |