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

Merge commit '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmerge

avinationmerge
Melanie 2011-10-12 07:24:46 +01:00
parent 628ca122b8 28f549bd64
commit 816d0de11a
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1363,27 +1363,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
string arg = rules.GetLSLStringItem(idx++); string arg = rules.GetLSLStringItem(idx++);
switch (code) switch (code)
{ {
case 0: case ScriptBaseClass.PARCEL_DETAILS_NAME:
newLand.Name = arg; newLand.Name = arg;
break; break;
case 1: case ScriptBaseClass.PARCEL_DETAILS_DESC:
newLand.Description = arg; newLand.Description = arg;
break; break;
case 2: case ScriptBaseClass.PARCEL_DETAILS_OWNER:
CheckThreatLevel(ThreatLevel.VeryHigh, functionName); CheckThreatLevel(ThreatLevel.VeryHigh, functionName);
if (UUID.TryParse(arg , out uuid)) if (UUID.TryParse(arg, out uuid))
newLand.OwnerID = uuid; newLand.OwnerID = uuid;
break; break;
case 3: case ScriptBaseClass.PARCEL_DETAILS_GROUP:
CheckThreatLevel(ThreatLevel.VeryHigh, functionName); CheckThreatLevel(ThreatLevel.VeryHigh, functionName);
if (UUID.TryParse(arg , out uuid)) if (UUID.TryParse(arg, out uuid))
newLand.GroupID = uuid; newLand.GroupID = uuid;
break; 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); World.LandChannel.UpdateLandObject(newLand.LocalID,newLand);
} }

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

@ -513,6 +513,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const int PARCEL_DETAILS_GROUP = 3; public const int PARCEL_DETAILS_GROUP = 3;
public const int PARCEL_DETAILS_AREA = 4; public const int PARCEL_DETAILS_AREA = 4;
public const int PARCEL_DETAILS_ID = 5; 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 // constants for llSetClickAction
public const int CLICK_ACTION_NONE = 0; public const int CLICK_ACTION_NONE = 0;