aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorSean Dague2008-07-23 15:50:32 +0000
committerSean Dague2008-07-23 15:50:32 +0000
commit090159defc731fca252b2b3520364712760f0f4e (patch)
tree78fe9dde5a9902d67aa6d1690cf575d778d154f2 /OpenSim/Region/ScriptEngine/Shared/Api
parentSend Animation data for other avatars to new users joining the region (tested... (diff)
downloadopensim-SC_OLD-090159defc731fca252b2b3520364712760f0f4e.zip
opensim-SC_OLD-090159defc731fca252b2b3520364712760f0f4e.tar.gz
opensim-SC_OLD-090159defc731fca252b2b3520364712760f0f4e.tar.bz2
opensim-SC_OLD-090159defc731fca252b2b3520364712760f0f4e.tar.xz
refactored LandData to use properties, and cleaned up the naming on
the properties a bit to be more consistant with other objects (having things like .Name .Description, etc).
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs64
1 files changed, 32 insertions, 32 deletions
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);