aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorTBG Renfold2019-07-26 19:08:40 +0100
committerUbitUmarov2019-07-31 12:58:11 +0100
commit0163af970f7c0bf792ee12d2267c6122ca35fb98 (patch)
treed5581085696c5ef55c8e144a01ff0a2a7dd50de3 /OpenSim/Region/ScriptEngine
parentMantis #8481 part one. (diff)
downloadopensim-SC-0163af970f7c0bf792ee12d2267c6122ca35fb98.zip
opensim-SC-0163af970f7c0bf792ee12d2267c6122ca35fb98.tar.gz
opensim-SC-0163af970f7c0bf792ee12d2267c6122ca35fb98.tar.bz2
opensim-SC-0163af970f7c0bf792ee12d2267c6122ca35fb98.tar.xz
Mantis #8481 part two.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs5
3 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 7d3c832..ab3a768 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1600,6 +1600,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1600 return 0.0f; 1600 return 0.0f;
1601 } 1601 }
1602 1602
1603 public int osGetParcelDwell(LSL_Vector pos)
1604 {
1605 LandData land = World.GetLandData(pos);
1606 if (land != null)
1607 {
1608 return (int)land.Dwell;
1609 }
1610 return 0;
1611 }
1612
1603 // Routines for creating and managing parcels programmatically 1613 // Routines for creating and managing parcels programmatically
1604 public void osParcelJoin(LSL_Vector pos1, LSL_Vector pos2) 1614 public void osParcelJoin(LSL_Vector pos1, LSL_Vector pos2)
1605 { 1615 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 194df36..5d964b8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -260,6 +260,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
260 LSL_Float osGetWindParam(string plugin, string param); 260 LSL_Float osGetWindParam(string plugin, string param);
261 261
262 // Parcel commands 262 // Parcel commands
263 int osGetParcelDwell(vector pos);
263 void osParcelJoin(vector pos1, vector pos2); 264 void osParcelJoin(vector pos1, vector pos2);
264 void osParcelSubdivide(vector pos1, vector pos2); 265 void osParcelSubdivide(vector pos1, vector pos2);
265 void osSetParcelDetails(vector pos, LSL_List rules); 266 void osSetParcelDetails(vector pos, LSL_List rules);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 88ea9d5..abdf0df 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -116,6 +116,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
116 return m_OSSL_Functions.osGetWindParam(plugin, param); 116 return m_OSSL_Functions.osGetWindParam(plugin, param);
117 } 117 }
118 118
119 public int osGetParcelDwell(vector pos)
120 {
121 return m_OSSL_Functions.osGetParcelDwell(pos);
122 }
123
119 public void osParcelJoin(vector pos1, vector pos2) 124 public void osParcelJoin(vector pos1, vector pos2)
120 { 125 {
121 m_OSSL_Functions.osParcelJoin(pos1,pos2); 126 m_OSSL_Functions.osParcelJoin(pos1,pos2);