OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change value of PARCEL_DETAILS_DWELL to a higher value to give more room for standard values, change return types, update script syntaxe

0.9.1.0-post-fixes
UbitUmarov 2019-07-31 13:38:49 +01:00
parent 0163af970f
commit b5b518dc0d
6 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -14343,7 +14343,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
case "5":
ret.Add(new LSL_Key(land.GlobalID.ToString()));
break;
case "20":
case "64":
ret.Add(new LSL_Integer(land.Dwell));
break;
default:

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -1600,7 +1600,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return 0.0f;
}
public int osGetParcelDwell(LSL_Vector pos)
public LSL_Integer osGetParcelDwell(LSL_Vector pos)
{
LandData land = World.GetLandData(pos);
if (land != null)

2
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
View File

@ -260,7 +260,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_Float osGetWindParam(string plugin, string param);
// Parcel commands
int osGetParcelDwell(vector pos);
LSL_Integer osGetParcelDwell(vector pos);
void osParcelJoin(vector pos1, vector pos2);
void osParcelSubdivide(vector pos1, vector pos2);
void osSetParcelDetails(vector pos, LSL_List rules);

5
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
View File

@ -35,7 +35,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public partial class ScriptBaseClass
{
// SCRIPTS CONSTANTS
public static readonly LSLInteger OS_APIVERSION = 4;
public static readonly LSLInteger OS_APIVERSION = 5;
public static readonly LSLInteger TRUE = 1;
public static readonly LSLInteger FALSE = 0;
@ -721,7 +721,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
// constants for llGetParcelDetails
public const int PARCEL_DETAILS_NAME = 0;
public const int PARCEL_DETAILS_DESC = 1;
public const int PARCEL_DETAILS_DWELL = 20;
public const int PARCEL_DETAILS_OWNER = 2;
public const int PARCEL_DETAILS_GROUP = 3;
public const int PARCEL_DETAILS_AREA = 4;
@ -729,6 +728,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const int PARCEL_DETAILS_SEE_AVATARS = 6;
public const int PARCEL_DETAILS_ANY_AVATAR_SOUNDS = 7;
public const int PARCEL_DETAILS_GROUP_SOUNDS = 8;
// constants for llGetParcelDetails os specific
public const int PARCEL_DETAILS_DWELL = 64;
//osSetParcelDetails
public const int PARCEL_DETAILS_CLAIMDATE = 10;

2
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
View File

@ -116,7 +116,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_OSSL_Functions.osGetWindParam(plugin, param);
}
public int osGetParcelDwell(vector pos)
public LSL_Integer osGetParcelDwell(vector pos)
{
return m_OSSL_Functions.osGetParcelDwell(pos);
}

25
bin/ScriptSyntax.xml
View File

@ -1,4 +1,4 @@
24121ec8-c0a3-099d-8d83-64feaa32418c
d2556181-baf5-e5b9-c8ec-99eda597b9f6
<llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>
<key>controls</key>
<map>
@ -1513,7 +1513,7 @@
</map>
<key>OS_APIVERSION</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>4</string>
<key>value</key><string>5</string>
</map>
<key>OS_ATTACH_MSG_ALL</key><map>
<key>type</key><string>integer</string>
@ -1665,6 +1665,10 @@
<key>type</key><string>integer</string>
<key>value</key><string>1</string>
</map>
<key>PARCEL_DETAILS_DWELL</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>64</string>
</map>
<key>PARCEL_DETAILS_GROUP</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>3</string>
@ -3017,6 +3021,10 @@
<key>type</key><string>integer</string>
<key>value</key><string>1</string>
</map>
<key>VEHICLE_FLAG_NO_FLY_UP</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>1</string>
</map>
<key>VEHICLE_FLAG_NO_X</key><map>
<key>type</key><string>integer</string>
<key>value</key><string>1024</string>
@ -6665,6 +6673,13 @@
<map><key>name</key><map><key>type</key><string>string</string></map></map>
</array>
</map>
<key>osGetParcelDwell</key>
<map>
<key>return</key><string>integer</string>
<key>arguments</key><array>
<map><key>pos</key><map><key>type</key><string>vector</string></map></map>
</array>
</map>
<key>osGetPhysicsEngineName</key>
<map>
<key>return</key><string>string</string>
@ -7581,7 +7596,6 @@
<key>arguments</key><array>
<map><key>src</key><map><key>type</key><string>string</string></map></map>
<map><key>start</key><map><key>type</key><string>integer</string></map></map>
<map><key>length</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>osStringSubString</key>
@ -7590,6 +7604,7 @@
<key>arguments</key><array>
<map><key>src</key><map><key>type</key><string>string</string></map></map>
<map><key>start</key><map><key>type</key><string>integer</string></map></map>
<map><key>length</key><map><key>type</key><string>integer</string></map></map>
</array>
</map>
<key>osSunGetParam</key>
@ -7619,6 +7634,8 @@
<map>
<key>arguments</key><array>
<map><key>agent</key><map><key>type</key><string>string</string></map></map>
<map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
<map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
</array>
@ -7627,8 +7644,6 @@
<map>
<key>arguments</key><array>
<map><key>agent</key><map><key>type</key><string>string</string></map></map>
<map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
<map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
</array>