aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs64
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs64
2 files changed, 64 insertions, 64 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index da1e511..b8a214a 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -4334,9 +4334,9 @@ namespace OpenSim.Region.ScriptEngine.Common
4334 ILandObject parcel = World.LandChannel.GetLandObject(av.AbsolutePosition.X, av.AbsolutePosition.Y); 4334 ILandObject parcel = World.LandChannel.GetLandObject(av.AbsolutePosition.X, av.AbsolutePosition.Y);
4335 if (parcel != null) 4335 if (parcel != null)
4336 { 4336 {
4337 if (m_host.ObjectOwner == parcel.landData.ownerID || 4337 if (m_host.ObjectOwner == parcel.landData.OwnerID ||
4338 (m_host.OwnerID == m_host.GroupID && m_host.GroupID == parcel.landData.groupID 4338 (m_host.OwnerID == m_host.GroupID && m_host.GroupID == parcel.landData.GroupID
4339 && parcel.landData.isGroupOwned) || World.ExternalChecks.ExternalChecksCanBeGodLike(m_host.OwnerID)) 4339 && parcel.landData.IsGroupOwned) || World.ExternalChecks.ExternalChecksCanBeGodLike(m_host.OwnerID))
4340 { 4340 {
4341 av.StandUp(); 4341 av.StandUp();
4342 } 4342 }
@@ -4702,7 +4702,7 @@ namespace OpenSim.Region.ScriptEngine.Common
4702 m_host.AddScriptLPS(1); 4702 m_host.AddScriptLPS(1);
4703 LLUUID key; 4703 LLUUID key;
4704 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 4704 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
4705 if (land.ownerID == m_host.OwnerID) 4705 if (land.OwnerID == m_host.OwnerID)
4706 { 4706 {
4707 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 4707 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
4708 if (LLUUID.TryParse(avatar, out key)) 4708 if (LLUUID.TryParse(avatar, out key))
@@ -4710,7 +4710,7 @@ namespace OpenSim.Region.ScriptEngine.Common
4710 entry.AgentID = key; 4710 entry.AgentID = key;
4711 entry.Flags = ParcelManager.AccessList.Access; 4711 entry.Flags = ParcelManager.AccessList.Access;
4712 entry.Time = DateTime.Now.AddHours(hours); 4712 entry.Time = DateTime.Now.AddHours(hours);
4713 land.parcelAccessList.Add(entry); 4713 land.ParcelAccessList.Add(entry);
4714 } 4714 }
4715 } 4715 }
4716 } 4716 }
@@ -6852,7 +6852,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6852 m_host.AddScriptLPS(1); 6852 m_host.AddScriptLPS(1);
6853 LLUUID key; 6853 LLUUID key;
6854 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 6854 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
6855 if (land.ownerID == m_host.OwnerID) 6855 if (land.OwnerID == m_host.OwnerID)
6856 { 6856 {
6857 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 6857 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
6858 if (LLUUID.TryParse(avatar, out key)) 6858 if (LLUUID.TryParse(avatar, out key))
@@ -6860,7 +6860,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6860 entry.AgentID = key; 6860 entry.AgentID = key;
6861 entry.Flags = ParcelManager.AccessList.Ban; 6861 entry.Flags = ParcelManager.AccessList.Ban;
6862 entry.Time = DateTime.Now.AddHours(hours); 6862 entry.Time = DateTime.Now.AddHours(hours);
6863 land.parcelAccessList.Add(entry); 6863 land.ParcelAccessList.Add(entry);
6864 } 6864 }
6865 } 6865 }
6866 } 6866 }
@@ -6870,15 +6870,15 @@ namespace OpenSim.Region.ScriptEngine.Common
6870 m_host.AddScriptLPS(1); 6870 m_host.AddScriptLPS(1);
6871 LLUUID key; 6871 LLUUID key;
6872 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 6872 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
6873 if (land.ownerID == m_host.OwnerID) 6873 if (land.OwnerID == m_host.OwnerID)
6874 { 6874 {
6875 if (LLUUID.TryParse(avatar, out key)) 6875 if (LLUUID.TryParse(avatar, out key))
6876 { 6876 {
6877 foreach (ParcelManager.ParcelAccessEntry entry in land.parcelAccessList) 6877 foreach (ParcelManager.ParcelAccessEntry entry in land.ParcelAccessList)
6878 { 6878 {
6879 if (entry.AgentID == key && entry.Flags == ParcelManager.AccessList.Access) 6879 if (entry.AgentID == key && entry.Flags == ParcelManager.AccessList.Access)
6880 { 6880 {
6881 land.parcelAccessList.Remove(entry); 6881 land.ParcelAccessList.Remove(entry);
6882 break; 6882 break;
6883 } 6883 }
6884 } 6884 }
@@ -6891,15 +6891,15 @@ namespace OpenSim.Region.ScriptEngine.Common
6891 m_host.AddScriptLPS(1); 6891 m_host.AddScriptLPS(1);
6892 LLUUID key; 6892 LLUUID key;
6893 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 6893 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
6894 if (land.ownerID == m_host.OwnerID) 6894 if (land.OwnerID == m_host.OwnerID)
6895 { 6895 {
6896 if (LLUUID.TryParse(avatar, out key)) 6896 if (LLUUID.TryParse(avatar, out key))
6897 { 6897 {
6898 foreach (ParcelManager.ParcelAccessEntry entry in land.parcelAccessList) 6898 foreach (ParcelManager.ParcelAccessEntry entry in land.ParcelAccessList)
6899 { 6899 {
6900 if (entry.AgentID == key && entry.Flags == ParcelManager.AccessList.Ban) 6900 if (entry.AgentID == key && entry.Flags == ParcelManager.AccessList.Ban)
6901 { 6901 {
6902 land.parcelAccessList.Remove(entry); 6902 land.ParcelAccessList.Remove(entry);
6903 break; 6903 break;
6904 } 6904 }
6905 } 6905 }
@@ -6961,7 +6961,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6961 public LSL_Types.LSLInteger llGetParcelFlags(LSL_Types.Vector3 pos) 6961 public LSL_Types.LSLInteger llGetParcelFlags(LSL_Types.Vector3 pos)
6962 { 6962 {
6963 m_host.AddScriptLPS(1); 6963 m_host.AddScriptLPS(1);
6964 return (int)World.LandChannel.GetLandObject((float)pos.x, (float)pos.y).landData.landFlags; 6964 return (int)World.LandChannel.GetLandObject((float)pos.x, (float)pos.y).landData.Flags;
6965 } 6965 }
6966 6966
6967 public LSL_Types.LSLInteger llGetRegionFlags() 6967 public LSL_Types.LSLInteger llGetRegionFlags()
@@ -7038,13 +7038,13 @@ namespace OpenSim.Region.ScriptEngine.Common
7038 { 7038 {
7039 m_host.AddScriptLPS(1); 7039 m_host.AddScriptLPS(1);
7040 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 7040 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
7041 if (land.ownerID == m_host.OwnerID) 7041 if (land.OwnerID == m_host.OwnerID)
7042 { 7042 {
7043 foreach (ParcelManager.ParcelAccessEntry entry in land.parcelAccessList) 7043 foreach (ParcelManager.ParcelAccessEntry entry in land.ParcelAccessList)
7044 { 7044 {
7045 if (entry.Flags == ParcelManager.AccessList.Ban) 7045 if (entry.Flags == ParcelManager.AccessList.Ban)
7046 { 7046 {
7047 land.parcelAccessList.Remove(entry); 7047 land.ParcelAccessList.Remove(entry);
7048 } 7048 }
7049 } 7049 }
7050 } 7050 }
@@ -7054,13 +7054,13 @@ namespace OpenSim.Region.ScriptEngine.Common
7054 { 7054 {
7055 m_host.AddScriptLPS(1); 7055 m_host.AddScriptLPS(1);
7056 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 7056 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
7057 if (land.ownerID == m_host.OwnerID) 7057 if (land.OwnerID == m_host.OwnerID)
7058 { 7058 {
7059 foreach (ParcelManager.ParcelAccessEntry entry in land.parcelAccessList) 7059 foreach (ParcelManager.ParcelAccessEntry entry in land.ParcelAccessList)
7060 { 7060 {
7061 if (entry.Flags == ParcelManager.AccessList.Access) 7061 if (entry.Flags == ParcelManager.AccessList.Access)
7062 { 7062 {
7063 land.parcelAccessList.Remove(entry); 7063 land.ParcelAccessList.Remove(entry);
7064 } 7064 }
7065 } 7065 }
7066 } 7066 }
@@ -7083,7 +7083,7 @@ namespace OpenSim.Region.ScriptEngine.Common
7083 { 7083 {
7084 if (category == 0) 7084 if (category == 0)
7085 { 7085 {
7086 return land.simwidePrims; 7086 return land.SimwidePrims;
7087 } 7087 }
7088 7088
7089 else 7089 else
@@ -7102,22 +7102,22 @@ namespace OpenSim.Region.ScriptEngine.Common
7102 7102
7103 else if (category == 1)//Owner Prims 7103 else if (category == 1)//Owner Prims
7104 { 7104 {
7105 return land.ownerPrims; 7105 return land.OwnerPrims;
7106 } 7106 }
7107 7107
7108 else if (category == 2)//Group Prims 7108 else if (category == 2)//Group Prims
7109 { 7109 {
7110 return land.groupPrims; 7110 return land.GroupPrims;
7111 } 7111 }
7112 7112
7113 else if (category == 3)//Other Prims 7113 else if (category == 3)//Other Prims
7114 { 7114 {
7115 return land.otherPrims; 7115 return land.OtherPrims;
7116 } 7116 }
7117 7117
7118 else if (category == 4)//Selected 7118 else if (category == 4)//Selected
7119 { 7119 {
7120 return land.selectedPrims; 7120 return land.SelectedPrims;
7121 } 7121 }
7122 7122
7123 else if (category == 5)//Temp 7123 else if (category == 5)//Temp
@@ -7175,14 +7175,14 @@ namespace OpenSim.Region.ScriptEngine.Common
7175 7175
7176 if (sim_wide == 1) 7176 if (sim_wide == 1)
7177 { 7177 {
7178 decimal v = land.simwideArea * (decimal)(0.22) * (decimal)bonusfactor; 7178 decimal v = land.SimwideArea * (decimal)(0.22) * (decimal)bonusfactor;
7179 7179
7180 return (int)v; 7180 return (int)v;
7181 } 7181 }
7182 7182
7183 else 7183 else
7184 { 7184 {
7185 decimal v = land.area * (decimal)(0.22) * (decimal)bonusfactor; 7185 decimal v = land.Area * (decimal)(0.22) * (decimal)bonusfactor;
7186 7186
7187 return (int)v; 7187 return (int)v;
7188 } 7188 }
@@ -7203,19 +7203,19 @@ namespace OpenSim.Region.ScriptEngine.Common
7203 switch (o.ToString()) 7203 switch (o.ToString())
7204 { 7204 {
7205 case "0": 7205 case "0":
7206 ret = ret + new LSL_Types.list(land.landName); 7206 ret = ret + new LSL_Types.list(land.Name);
7207 break; 7207 break;
7208 case "1": 7208 case "1":
7209 ret = ret + new LSL_Types.list(land.landDesc); 7209 ret = ret + new LSL_Types.list(land.Description);
7210 break; 7210 break;
7211 case "2": 7211 case "2":
7212 ret = ret + new LSL_Types.list(land.ownerID.ToString()); 7212 ret = ret + new LSL_Types.list(land.OwnerID.ToString());
7213 break; 7213 break;
7214 case "3": 7214 case "3":
7215 ret = ret + new LSL_Types.list(land.groupID.ToString()); 7215 ret = ret + new LSL_Types.list(land.GroupID.ToString());
7216 break; 7216 break;
7217 case "4": 7217 case "4":
7218 ret = ret + new LSL_Types.list(land.area); 7218 ret = ret + new LSL_Types.list(land.Area);
7219 break; 7219 break;
7220 default: 7220 default:
7221 ret = ret + new LSL_Types.list(0); 7221 ret = ret + new LSL_Types.list(0);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index a5c5453..c7a7581 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4198,9 +4198,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4198 ILandObject parcel = World.LandChannel.GetLandObject(av.AbsolutePosition.X, av.AbsolutePosition.Y); 4198 ILandObject parcel = World.LandChannel.GetLandObject(av.AbsolutePosition.X, av.AbsolutePosition.Y);
4199 if (parcel != null) 4199 if (parcel != null)
4200 { 4200 {
4201 if (m_host.ObjectOwner == parcel.landData.ownerID || 4201 if (m_host.ObjectOwner == parcel.landData.OwnerID ||
4202 (m_host.OwnerID == m_host.GroupID && m_host.GroupID == parcel.landData.groupID 4202 (m_host.OwnerID == m_host.GroupID && m_host.GroupID == parcel.landData.GroupID
4203 && parcel.landData.isGroupOwned) || World.ExternalChecks.ExternalChecksCanBeGodLike(m_host.OwnerID)) 4203 && parcel.landData.IsGroupOwned) || World.ExternalChecks.ExternalChecksCanBeGodLike(m_host.OwnerID))
4204 { 4204 {
4205 av.StandUp(); 4205 av.StandUp();
4206 } 4206 }
@@ -4566,7 +4566,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4566 m_host.AddScriptLPS(1); 4566 m_host.AddScriptLPS(1);
4567 LLUUID key; 4567 LLUUID key;
4568 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 4568 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
4569 if (land.ownerID == m_host.OwnerID) 4569 if (land.OwnerID == m_host.OwnerID)
4570 { 4570 {
4571 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 4571 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
4572 if (LLUUID.TryParse(avatar, out key)) 4572 if (LLUUID.TryParse(avatar, out key))
@@ -4574,7 +4574,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4574 entry.AgentID = key; 4574 entry.AgentID = key;
4575 entry.Flags = ParcelManager.AccessList.Access; 4575 entry.Flags = ParcelManager.AccessList.Access;
4576 entry.Time = DateTime.Now.AddHours(hours); 4576 entry.Time = DateTime.Now.AddHours(hours);
4577 land.parcelAccessList.Add(entry); 4577 land.ParcelAccessList.Add(entry);
4578 } 4578 }
4579 } 4579 }
4580 } 4580 }
@@ -6632,7 +6632,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6632 m_host.AddScriptLPS(1); 6632 m_host.AddScriptLPS(1);
6633 LLUUID key; 6633 LLUUID key;
6634 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 6634 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
6635 if (land.ownerID == m_host.OwnerID) 6635 if (land.OwnerID == m_host.OwnerID)
6636 { 6636 {
6637 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 6637 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
6638 if (LLUUID.TryParse(avatar, out key)) 6638 if (LLUUID.TryParse(avatar, out key))
@@ -6640,7 +6640,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6640 entry.AgentID = key; 6640 entry.AgentID = key;
6641 entry.Flags = ParcelManager.AccessList.Ban; 6641 entry.Flags = ParcelManager.AccessList.Ban;
6642 entry.Time = DateTime.Now.AddHours(hours); 6642 entry.Time = DateTime.Now.AddHours(hours);
6643 land.parcelAccessList.Add(entry); 6643 land.ParcelAccessList.Add(entry);
6644 } 6644 }
6645 } 6645 }
6646 } 6646 }
@@ -6650,15 +6650,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6650 m_host.AddScriptLPS(1); 6650 m_host.AddScriptLPS(1);
6651 LLUUID key; 6651 LLUUID key;
6652 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 6652 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
6653 if (land.ownerID == m_host.OwnerID) 6653 if (land.OwnerID == m_host.OwnerID)
6654 { 6654 {
6655 if (LLUUID.TryParse(avatar, out key)) 6655 if (LLUUID.TryParse(avatar, out key))
6656 { 6656 {
6657 foreach (ParcelManager.ParcelAccessEntry entry in land.parcelAccessList) 6657 foreach (ParcelManager.ParcelAccessEntry entry in land.ParcelAccessList)
6658 { 6658 {
6659 if (entry.AgentID == key && entry.Flags == ParcelManager.AccessList.Access) 6659 if (entry.AgentID == key && entry.Flags == ParcelManager.AccessList.Access)
6660 { 6660 {
6661 land.parcelAccessList.Remove(entry); 6661 land.ParcelAccessList.Remove(entry);
6662 break; 6662 break;
6663 } 6663 }
6664 } 6664 }
@@ -6671,15 +6671,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6671 m_host.AddScriptLPS(1); 6671 m_host.AddScriptLPS(1);
6672 LLUUID key; 6672 LLUUID key;
6673 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 6673 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
6674 if (land.ownerID == m_host.OwnerID) 6674 if (land.OwnerID == m_host.OwnerID)
6675 { 6675 {
6676 if (LLUUID.TryParse(avatar, out key)) 6676 if (LLUUID.TryParse(avatar, out key))
6677 { 6677 {
6678 foreach (ParcelManager.ParcelAccessEntry entry in land.parcelAccessList) 6678 foreach (ParcelManager.ParcelAccessEntry entry in land.ParcelAccessList)
6679 { 6679 {
6680 if (entry.AgentID == key && entry.Flags == ParcelManager.AccessList.Ban) 6680 if (entry.AgentID == key && entry.Flags == ParcelManager.AccessList.Ban)
6681 { 6681 {
6682 land.parcelAccessList.Remove(entry); 6682 land.ParcelAccessList.Remove(entry);
6683 break; 6683 break;
6684 } 6684 }
6685 } 6685 }
@@ -6741,7 +6741,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6741 public LSL_Types.LSLInteger llGetParcelFlags(LSL_Types.Vector3 pos) 6741 public LSL_Types.LSLInteger llGetParcelFlags(LSL_Types.Vector3 pos)
6742 { 6742 {
6743 m_host.AddScriptLPS(1); 6743 m_host.AddScriptLPS(1);
6744 return (int)World.LandChannel.GetLandObject((float)pos.x, (float)pos.y).landData.landFlags; 6744 return (int)World.LandChannel.GetLandObject((float)pos.x, (float)pos.y).landData.Flags;
6745 } 6745 }
6746 6746
6747 public LSL_Types.LSLInteger llGetRegionFlags() 6747 public LSL_Types.LSLInteger llGetRegionFlags()
@@ -6818,13 +6818,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6818 { 6818 {
6819 m_host.AddScriptLPS(1); 6819 m_host.AddScriptLPS(1);
6820 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 6820 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
6821 if (land.ownerID == m_host.OwnerID) 6821 if (land.OwnerID == m_host.OwnerID)
6822 { 6822 {
6823 foreach (ParcelManager.ParcelAccessEntry entry in land.parcelAccessList) 6823 foreach (ParcelManager.ParcelAccessEntry entry in land.ParcelAccessList)
6824 { 6824 {
6825 if (entry.Flags == ParcelManager.AccessList.Ban) 6825 if (entry.Flags == ParcelManager.AccessList.Ban)
6826 { 6826 {
6827 land.parcelAccessList.Remove(entry); 6827 land.ParcelAccessList.Remove(entry);
6828 } 6828 }
6829 } 6829 }
6830 } 6830 }
@@ -6834,13 +6834,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6834 { 6834 {
6835 m_host.AddScriptLPS(1); 6835 m_host.AddScriptLPS(1);
6836 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 6836 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
6837 if (land.ownerID == m_host.OwnerID) 6837 if (land.OwnerID == m_host.OwnerID)
6838 { 6838 {
6839 foreach (ParcelManager.ParcelAccessEntry entry in land.parcelAccessList) 6839 foreach (ParcelManager.ParcelAccessEntry entry in land.ParcelAccessList)
6840 { 6840 {
6841 if (entry.Flags == ParcelManager.AccessList.Access) 6841 if (entry.Flags == ParcelManager.AccessList.Access)
6842 { 6842 {
6843 land.parcelAccessList.Remove(entry); 6843 land.ParcelAccessList.Remove(entry);
6844 } 6844 }
6845 } 6845 }
6846 } 6846 }
@@ -6863,7 +6863,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6863 { 6863 {
6864 if (category == 0) 6864 if (category == 0)
6865 { 6865 {
6866 return land.simwidePrims; 6866 return land.SimwidePrims;
6867 } 6867 }
6868 6868
6869 else 6869 else
@@ -6882,22 +6882,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6882 6882
6883 else if (category == 1)//Owner Prims 6883 else if (category == 1)//Owner Prims
6884 { 6884 {
6885 return land.ownerPrims; 6885 return land.OwnerPrims;
6886 } 6886 }
6887 6887
6888 else if (category == 2)//Group Prims 6888 else if (category == 2)//Group Prims
6889 { 6889 {
6890 return land.groupPrims; 6890 return land.GroupPrims;
6891 } 6891 }
6892 6892
6893 else if (category == 3)//Other Prims 6893 else if (category == 3)//Other Prims
6894 { 6894 {
6895 return land.otherPrims; 6895 return land.OtherPrims;
6896 } 6896 }
6897 6897
6898 else if (category == 4)//Selected 6898 else if (category == 4)//Selected
6899 { 6899 {
6900 return land.selectedPrims; 6900 return land.SelectedPrims;
6901 } 6901 }
6902 6902
6903 else if (category == 5)//Temp 6903 else if (category == 5)//Temp
@@ -6955,14 +6955,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6955 6955
6956 if (sim_wide == 1) 6956 if (sim_wide == 1)
6957 { 6957 {
6958 decimal v = land.simwideArea * (decimal)(0.22) * (decimal)bonusfactor; 6958 decimal v = land.SimwideArea * (decimal)(0.22) * (decimal)bonusfactor;
6959 6959
6960 return (int)v; 6960 return (int)v;
6961 } 6961 }
6962 6962
6963 else 6963 else
6964 { 6964 {
6965 decimal v = land.area * (decimal)(0.22) * (decimal)bonusfactor; 6965 decimal v = land.Area * (decimal)(0.22) * (decimal)bonusfactor;
6966 6966
6967 return (int)v; 6967 return (int)v;
6968 } 6968 }
@@ -6983,19 +6983,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6983 switch (o.ToString()) 6983 switch (o.ToString())
6984 { 6984 {
6985 case "0": 6985 case "0":
6986 ret = ret + new LSL_Types.list(land.landName); 6986 ret = ret + new LSL_Types.list(land.Name);
6987 break; 6987 break;
6988 case "1": 6988 case "1":
6989 ret = ret + new LSL_Types.list(land.landDesc); 6989 ret = ret + new LSL_Types.list(land.Description);
6990 break; 6990 break;
6991 case "2": 6991 case "2":
6992 ret = ret + new LSL_Types.list(land.ownerID.ToString()); 6992 ret = ret + new LSL_Types.list(land.OwnerID.ToString());
6993 break; 6993 break;
6994 case "3": 6994 case "3":
6995 ret = ret + new LSL_Types.list(land.groupID.ToString()); 6995 ret = ret + new LSL_Types.list(land.GroupID.ToString());
6996 break; 6996 break;
6997 case "4": 6997 case "4":
6998 ret = ret + new LSL_Types.list(land.area); 6998 ret = ret + new LSL_Types.list(land.Area);
6999 break; 6999 break;
7000 default: 7000 default:
7001 ret = ret + new LSL_Types.list(0); 7001 ret = ret + new LSL_Types.list(0);
generated by cgit v1.1 at 2024-12-24 10:15:47 +0000