aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorUbitUmarov2016-12-04 17:56:47 +0000
committerUbitUmarov2016-12-04 17:56:47 +0000
commit51104be6d41170bc17d0d24278868b6c1cddfed7 (patch)
tree09ee6d57dde7d4d47dffff785d5b1576e1e4956b /OpenSim/Region/ScriptEngine
parentThe new Constant: integer OBJECT_REZZER_KEY = 32; (diff)
downloadopensim-SC-51104be6d41170bc17d0d24278868b6c1cddfed7.zip
opensim-SC-51104be6d41170bc17d0d24278868b6c1cddfed7.tar.gz
opensim-SC-51104be6d41170bc17d0d24278868b6c1cddfed7.tar.bz2
opensim-SC-51104be6d41170bc17d0d24278868b6c1cddfed7.tar.xz
remove SOG.FromPartID from main code and flag it obsolete
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs6
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>