diff options
| author | Teravus Ovares (Dan Olivares) | 2009-11-25 14:13:51 -0500 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-11-25 14:13:51 -0500 |
| commit | dac9c6fb2360fd46603e08877d57a704eb02e183 (patch) | |
| tree | 614ef8a4851d69a3fb3a76c7839ef576c234b6e7 /OpenSim/Region/CoreModules/World/Land/LandChannel.cs | |
| parent | Patch: Fix a bug in LAND animation when the TickCount wraps into negative num... (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.zip opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.gz opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.bz2 opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandChannel.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandChannel.cs | 3 |
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) |