Merge commit '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmerge

2 files changed, 32 insertions, 21 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index bd97f76..b19f8cf 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1363,27 +1363,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 string arg = rules.GetLSLStringItem(idx++);
                 switch (code)
                 {
-                    case 0:
-                      newLand.Name = arg;
-                      break;
-
-                    case 1:
-                      newLand.Description = arg;
-                      break;
-
-                    case 2:
-                      CheckThreatLevel(ThreatLevel.VeryHigh, functionName);
-                      if (UUID.TryParse(arg , out uuid))
-                          newLand.OwnerID = uuid;
-                      break;
-
-                    case 3:
-                      CheckThreatLevel(ThreatLevel.VeryHigh, functionName);
-                      if (UUID.TryParse(arg , out uuid))
-                          newLand.GroupID = uuid;
-                      break;
-                }
-            }
+                    case ScriptBaseClass.PARCEL_DETAILS_NAME:
+                        newLand.Name = arg;
+                        break;
+
+                    case ScriptBaseClass.PARCEL_DETAILS_DESC:
+                        newLand.Description = arg;
+                        break;
+
+                    case ScriptBaseClass.PARCEL_DETAILS_OWNER:
+                        CheckThreatLevel(ThreatLevel.VeryHigh, functionName);
+                        if (UUID.TryParse(arg, out uuid))
+                            newLand.OwnerID = uuid;
+                        break;
+
+                    case ScriptBaseClass.PARCEL_DETAILS_GROUP:
+                        CheckThreatLevel(ThreatLevel.VeryHigh, functionName);
+                        if (UUID.TryParse(arg, out uuid))
+                            newLand.GroupID = uuid;
+                        break;
+
+                    case ScriptBaseClass.PARCEL_DETAILS_CLAIMDATE:
+                        CheckThreatLevel(ThreatLevel.VeryHigh, functionName);
+                        newLand.ClaimDate = Convert.ToInt32(arg);
+                        if (newLand.ClaimDate == 0)
+                            newLand.ClaimDate = Util.UnixTimeSinceEpoch();
+                        break;
+                 }
+             }
 
             World.LandChannel.UpdateLandObject(newLand.LocalID,newLand);
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 59eaccb..864d59c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -513,6 +513,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int PARCEL_DETAILS_GROUP = 3;
         public const int PARCEL_DETAILS_AREA = 4;
         public const int PARCEL_DETAILS_ID = 5;
+        public const int PARCEL_DETAILS_SEE_AVATARS = 6; // not implemented
+
+        //osSetParcelDetails
+        public const int PARCEL_DETAILS_CLAIMDATE = 10;
 
         // constants for llSetClickAction
         public const int CLICK_ACTION_NONE = 0;