ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of /var/git/opensim/

Browse Source
This commit is contained in:
opensim mirror account
2010-11-11 18:20:08 -08:00
parent b02ca416e5 672ee2a888
commit 4b21e4d7c5
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9882,6 +9882,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
case "4":
ret = ret + new LSL_List(land.Area);
break;
case "5":
ret = ret + new LSL_List(land.GlobalID);
break;
default:
ret = ret + new LSL_List(0);
break;

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

@@ -507,6 +507,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const int PARCEL_DETAILS_OWNER = 2;
public const int PARCEL_DETAILS_GROUP = 3;
public const int PARCEL_DETAILS_AREA = 4;
public const int PARCEL_DETAILS_ID = 5;
// constants for llSetClickAction
public const int CLICK_ACTION_NONE = 0;

4
prebuild.xml
View File

@@ -2155,7 +2155,7 @@
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenMetaverseTypes" path="../../../bin/"/>
<Reference name="OpenMetaverse" path="../../../bin/"/>
<Reference name="Mono.Data.SqliteClient"/>
<Reference name="Mono.Data.SqliteClient" path="../../../bin"/>
<Reference name="Mono.Addins" path="../../../bin/"/>
<Reference name="log4net" path="../../../bin/"/>
@@ -2503,7 +2503,7 @@
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Framework.Statistics"/>
<Reference name="OpenSim.Region.Physics.Manager"/>
<Reference name="Mono.Data.SqliteClient"/>
<Reference name="Mono.Data.SqliteClient" path="../../../bin/"/>
<Reference name="Mono.Addins"/>
<!-- For scripting in funny languages by default -->