aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
diff options
context:
space:
mode:
authorMelanie2009-11-25 17:03:11 +0000
committerMelanie2009-11-25 17:03:11 +0000
commitcc3617f74fd857860d4396997f2d3d6a0169db5f (patch)
treee33bb44b27ec91dd22f603a074d86cde56c12da4 /OpenSim/Region/CoreModules/World/Land/LandChannel.cs
parentChange osTeleportAgent parameters from long to int. That numerical range is (diff)
parentminor: add doc to a few parcel methods (diff)
downloadopensim-SC_OLD-cc3617f74fd857860d4396997f2d3d6a0169db5f.zip
opensim-SC_OLD-cc3617f74fd857860d4396997f2d3d6a0169db5f.tar.gz
opensim-SC_OLD-cc3617f74fd857860d4396997f2d3d6a0169db5f.tar.bz2
opensim-SC_OLD-cc3617f74fd857860d4396997f2d3d6a0169db5f.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandChannel.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandChannel.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index 4ed23bb..81024db 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.World.Land
105 ILandObject obj = new LandObject(UUID.Zero, false, m_scene); 105 ILandObject obj = new LandObject(UUID.Zero, false, m_scene);
106 obj.LandData.Name = "NO LAND"; 106 obj.LandData.Name = "NO LAND";
107 return obj; 107 return obj;
108 } 108 }
109 109
110 public List<ILandObject> AllParcels() 110 public List<ILandObject> AllParcels()
111 { 111 {
@@ -154,6 +154,7 @@ namespace OpenSim.Region.CoreModules.World.Land
154 m_landManagementModule.UpdateLandObject(localID, data); 154 m_landManagementModule.UpdateLandObject(localID, data);
155 } 155 }
156 } 156 }
157
157 public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient) 158 public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient)
158 { 159 {
159 if (m_landManagementModule != null) 160 if (m_landManagementModule != null)