aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common
diff options
context:
space:
mode:
authorAdam Frisby2008-05-06 04:56:48 +0000
committerAdam Frisby2008-05-06 04:56:48 +0000
commit31cd162d34ab03284186484924e434a1187942cf (patch)
tree0edad805100caebd12d3bb103bef42503b92de57 /OpenSim/Region/ScriptEngine/Common
parent* Committing a bunch of work for control snatching. Not done yet. No visib... (diff)
downloadopensim-SC_OLD-31cd162d34ab03284186484924e434a1187942cf.zip
opensim-SC_OLD-31cd162d34ab03284186484924e434a1187942cf.tar.gz
opensim-SC_OLD-31cd162d34ab03284186484924e434a1187942cf.tar.bz2
opensim-SC_OLD-31cd162d34ab03284186484924e434a1187942cf.tar.xz
* Cleaning up code, making it conform to OpenSim standards.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 59afe32..c8b7d5c 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -3875,7 +3875,7 @@ namespace OpenSim.Region.ScriptEngine.Common
3875 // or 3875 // or
3876 // if the object is owned by a person with estate access. 3876 // if the object is owned by a person with estate access.
3877 3877
3878 ILandObject parcel = World.LandChannel.getLandObject(av.AbsolutePosition.X, av.AbsolutePosition.Y); 3878 ILandObject parcel = World.LandChannel.GetLandObject(av.AbsolutePosition.X, av.AbsolutePosition.Y);
3879 if (parcel != null) 3879 if (parcel != null)
3880 { 3880 {
3881 if (m_host.ObjectOwner == parcel.landData.ownerID || 3881 if (m_host.ObjectOwner == parcel.landData.ownerID ||
@@ -4214,7 +4214,7 @@ namespace OpenSim.Region.ScriptEngine.Common
4214 { 4214 {
4215 m_host.AddScriptLPS(1); 4215 m_host.AddScriptLPS(1);
4216 LLUUID key; 4216 LLUUID key;
4217 LandData land = World.LandChannel.getLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 4217 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
4218 if (land.ownerID == m_host.OwnerID) 4218 if (land.ownerID == m_host.OwnerID)
4219 { 4219 {
4220 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 4220 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
@@ -5599,7 +5599,7 @@ namespace OpenSim.Region.ScriptEngine.Common
5599 { 5599 {
5600 m_host.AddScriptLPS(1); 5600 m_host.AddScriptLPS(1);
5601 LLUUID key; 5601 LLUUID key;
5602 LandData land = World.LandChannel.getLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 5602 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
5603 if (land.ownerID == m_host.OwnerID) 5603 if (land.ownerID == m_host.OwnerID)
5604 { 5604 {
5605 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 5605 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
@@ -5617,7 +5617,7 @@ namespace OpenSim.Region.ScriptEngine.Common
5617 { 5617 {
5618 m_host.AddScriptLPS(1); 5618 m_host.AddScriptLPS(1);
5619 LLUUID key; 5619 LLUUID key;
5620 LandData land = World.LandChannel.getLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 5620 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
5621 if (land.ownerID == m_host.OwnerID) 5621 if (land.ownerID == m_host.OwnerID)
5622 { 5622 {
5623 if (LLUUID.TryParse(avatar, out key)) 5623 if (LLUUID.TryParse(avatar, out key))
@@ -5638,7 +5638,7 @@ namespace OpenSim.Region.ScriptEngine.Common
5638 { 5638 {
5639 m_host.AddScriptLPS(1); 5639 m_host.AddScriptLPS(1);
5640 LLUUID key; 5640 LLUUID key;
5641 LandData land = World.LandChannel.getLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 5641 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
5642 if (land.ownerID == m_host.OwnerID) 5642 if (land.ownerID == m_host.OwnerID)
5643 { 5643 {
5644 if (LLUUID.TryParse(avatar, out key)) 5644 if (LLUUID.TryParse(avatar, out key))
@@ -5709,7 +5709,7 @@ namespace OpenSim.Region.ScriptEngine.Common
5709 public int llGetParcelFlags(LSL_Types.Vector3 pos) 5709 public int llGetParcelFlags(LSL_Types.Vector3 pos)
5710 { 5710 {
5711 m_host.AddScriptLPS(1); 5711 m_host.AddScriptLPS(1);
5712 return (int)World.LandChannel.getLandObject((float)pos.x, (float)pos.y).landData.landFlags; 5712 return (int)World.LandChannel.GetLandObject((float)pos.x, (float)pos.y).landData.landFlags;
5713 } 5713 }
5714 5714
5715 public int llGetRegionFlags() 5715 public int llGetRegionFlags()
@@ -5763,7 +5763,7 @@ namespace OpenSim.Region.ScriptEngine.Common
5763 public void llResetLandBanList() 5763 public void llResetLandBanList()
5764 { 5764 {
5765 m_host.AddScriptLPS(1); 5765 m_host.AddScriptLPS(1);
5766 LandData land = World.LandChannel.getLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 5766 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
5767 if (land.ownerID == m_host.OwnerID) 5767 if (land.ownerID == m_host.OwnerID)
5768 { 5768 {
5769 foreach (ParcelManager.ParcelAccessEntry entry in land.parcelAccessList) 5769 foreach (ParcelManager.ParcelAccessEntry entry in land.parcelAccessList)
@@ -5779,7 +5779,7 @@ namespace OpenSim.Region.ScriptEngine.Common
5779 public void llResetLandPassList() 5779 public void llResetLandPassList()
5780 { 5780 {
5781 m_host.AddScriptLPS(1); 5781 m_host.AddScriptLPS(1);
5782 LandData land = World.LandChannel.getLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; 5782 LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData;
5783 if (land.ownerID == m_host.OwnerID) 5783 if (land.ownerID == m_host.OwnerID)
5784 { 5784 {
5785 foreach (ParcelManager.ParcelAccessEntry entry in land.parcelAccessList) 5785 foreach (ParcelManager.ParcelAccessEntry entry in land.parcelAccessList)
@@ -5858,7 +5858,7 @@ namespace OpenSim.Region.ScriptEngine.Common
5858 public LSL_Types.list llGetParcelPrimOwners(LSL_Types.Vector3 pos) 5858 public LSL_Types.list llGetParcelPrimOwners(LSL_Types.Vector3 pos)
5859 { 5859 {
5860 m_host.AddScriptLPS(1); 5860 m_host.AddScriptLPS(1);
5861 LandObject land = (LandObject)World.LandChannel.getLandObject((float)pos.x, (float)pos.y); 5861 LandObject land = (LandObject)World.LandChannel.GetLandObject((float)pos.x, (float)pos.y);
5862 LSL_Types.list ret = new LSL_Types.list(); 5862 LSL_Types.list ret = new LSL_Types.list();
5863 if (land != null) 5863 if (land != null)
5864 { 5864 {