aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoropensim mirror account2010-11-11 18:20:08 -0800
committeropensim mirror account2010-11-11 18:20:08 -0800
commit4b21e4d7c513d5dec4bc64f593c0dbc2acdf583b (patch)
tree15d40c62524b4a2cf1ba18f9c1d6f6106086c804
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentPrebuild fix (diff)
downloadopensim-SC-4b21e4d7c513d5dec4bc64f593c0dbc2acdf583b.zip
opensim-SC-4b21e4d7c513d5dec4bc64f593c0dbc2acdf583b.tar.gz
opensim-SC-4b21e4d7c513d5dec4bc64f593c0dbc2acdf583b.tar.bz2
opensim-SC-4b21e4d7c513d5dec4bc64f593c0dbc2acdf583b.tar.xz
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs1
-rw-r--r--prebuild.xml4
3 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 1a13dea..c251a49 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9882,6 +9882,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9882 case "4": 9882 case "4":
9883 ret = ret + new LSL_List(land.Area); 9883 ret = ret + new LSL_List(land.Area);
9884 break; 9884 break;
9885 case "5":
9886 ret = ret + new LSL_List(land.GlobalID);
9887 break;
9885 default: 9888 default:
9886 ret = ret + new LSL_List(0); 9889 ret = ret + new LSL_List(0);
9887 break; 9890 break;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index b96e977..b3c4d95 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -507,6 +507,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
507 public const int PARCEL_DETAILS_OWNER = 2; 507 public const int PARCEL_DETAILS_OWNER = 2;
508 public const int PARCEL_DETAILS_GROUP = 3; 508 public const int PARCEL_DETAILS_GROUP = 3;
509 public const int PARCEL_DETAILS_AREA = 4; 509 public const int PARCEL_DETAILS_AREA = 4;
510 public const int PARCEL_DETAILS_ID = 5;
510 511
511 // constants for llSetClickAction 512 // constants for llSetClickAction
512 public const int CLICK_ACTION_NONE = 0; 513 public const int CLICK_ACTION_NONE = 0;
diff --git a/prebuild.xml b/prebuild.xml
index c6eb65a..9df820e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2155,7 +2155,7 @@
2155 <Reference name="OpenSim.Region.Framework"/> 2155 <Reference name="OpenSim.Region.Framework"/>
2156 <Reference name="OpenMetaverseTypes" path="../../../bin/"/> 2156 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
2157 <Reference name="OpenMetaverse" path="../../../bin/"/> 2157 <Reference name="OpenMetaverse" path="../../../bin/"/>
2158 <Reference name="Mono.Data.SqliteClient"/> 2158 <Reference name="Mono.Data.SqliteClient" path="../../../bin"/>
2159 <Reference name="Mono.Addins" path="../../../bin/"/> 2159 <Reference name="Mono.Addins" path="../../../bin/"/>
2160 <Reference name="log4net" path="../../../bin/"/> 2160 <Reference name="log4net" path="../../../bin/"/>
2161 2161
@@ -2503,7 +2503,7 @@
2503 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 2503 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
2504 <Reference name="OpenSim.Framework.Statistics"/> 2504 <Reference name="OpenSim.Framework.Statistics"/>
2505 <Reference name="OpenSim.Region.Physics.Manager"/> 2505 <Reference name="OpenSim.Region.Physics.Manager"/>
2506 <Reference name="Mono.Data.SqliteClient"/> 2506 <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/>
2507 <Reference name="Mono.Addins"/> 2507 <Reference name="Mono.Addins"/>
2508 2508
2509 <!-- For scripting in funny languages by default --> 2509 <!-- For scripting in funny languages by default -->