aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs2
5 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e59bfe8..980b2a5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -14343,7 +14343,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
14343 case "5": 14343 case "5":
14344 ret.Add(new LSL_Key(land.GlobalID.ToString())); 14344 ret.Add(new LSL_Key(land.GlobalID.ToString()));
14345 break; 14345 break;
14346 case "20": 14346 case "64":
14347 ret.Add(new LSL_Integer(land.Dwell)); 14347 ret.Add(new LSL_Integer(land.Dwell));
14348 break; 14348 break;
14349 default: 14349 default:
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index ab3a768..62da221 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1600,7 +1600,7 @@ 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) 1603 public LSL_Integer osGetParcelDwell(LSL_Vector pos)
1604 { 1604 {
1605 LandData land = World.GetLandData(pos); 1605 LandData land = World.GetLandData(pos);
1606 if (land != null) 1606 if (land != null)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 5d964b8..7c5ced8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -260,7 +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 LSL_Integer osGetParcelDwell(vector pos);
264 void osParcelJoin(vector pos1, vector pos2); 264 void osParcelJoin(vector pos1, vector pos2);
265 void osParcelSubdivide(vector pos1, vector pos2); 265 void osParcelSubdivide(vector pos1, vector pos2);
266 void osSetParcelDetails(vector pos, LSL_List rules); 266 void osSetParcelDetails(vector pos, LSL_List rules);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 371460a..f93cea8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
35 public partial class ScriptBaseClass 35 public partial class ScriptBaseClass
36 { 36 {
37 // SCRIPTS CONSTANTS 37 // SCRIPTS CONSTANTS
38 public static readonly LSLInteger OS_APIVERSION = 4; 38 public static readonly LSLInteger OS_APIVERSION = 5;
39 39
40 public static readonly LSLInteger TRUE = 1; 40 public static readonly LSLInteger TRUE = 1;
41 public static readonly LSLInteger FALSE = 0; 41 public static readonly LSLInteger FALSE = 0;
@@ -721,7 +721,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
721 // constants for llGetParcelDetails 721 // constants for llGetParcelDetails
722 public const int PARCEL_DETAILS_NAME = 0; 722 public const int PARCEL_DETAILS_NAME = 0;
723 public const int PARCEL_DETAILS_DESC = 1; 723 public const int PARCEL_DETAILS_DESC = 1;
724 public const int PARCEL_DETAILS_DWELL = 20;
725 public const int PARCEL_DETAILS_OWNER = 2; 724 public const int PARCEL_DETAILS_OWNER = 2;
726 public const int PARCEL_DETAILS_GROUP = 3; 725 public const int PARCEL_DETAILS_GROUP = 3;
727 public const int PARCEL_DETAILS_AREA = 4; 726 public const int PARCEL_DETAILS_AREA = 4;
@@ -729,6 +728,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
729 public const int PARCEL_DETAILS_SEE_AVATARS = 6; 728 public const int PARCEL_DETAILS_SEE_AVATARS = 6;
730 public const int PARCEL_DETAILS_ANY_AVATAR_SOUNDS = 7; 729 public const int PARCEL_DETAILS_ANY_AVATAR_SOUNDS = 7;
731 public const int PARCEL_DETAILS_GROUP_SOUNDS = 8; 730 public const int PARCEL_DETAILS_GROUP_SOUNDS = 8;
731 // constants for llGetParcelDetails os specific
732 public const int PARCEL_DETAILS_DWELL = 64;
732 733
733 //osSetParcelDetails 734 //osSetParcelDetails
734 public const int PARCEL_DETAILS_CLAIMDATE = 10; 735 public const int PARCEL_DETAILS_CLAIMDATE = 10;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index abdf0df..6a70305 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -116,7 +116,7 @@ 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) 119 public LSL_Integer osGetParcelDwell(vector pos)
120 { 120 {
121 return m_OSSL_Functions.osGetParcelDwell(pos); 121 return m_OSSL_Functions.osGetParcelDwell(pos);
122 } 122 }