From c213a12b571a42478cb9908ea9d6be1cd9962ba2 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Thu, 5 Mar 2009 20:32:35 +0000 Subject: * simplify media and music url setting since we never get back a null land object --- OpenSim/Region/CoreModules/World/Land/LandChannel.cs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'OpenSim/Region/CoreModules/World/Land') diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs index 97af6f4..9822af7 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs @@ -74,19 +74,13 @@ namespace OpenSim.Region.CoreModules.World.Land #region ILandChannel Members - - /// - /// Get the land object at the specified point - /// - /// Value between 0 - 256 on the x axis of the point - /// Value between 0 - 256 on the y axis of the point - /// Land object at the point supplied public ILandObject GetLandObject(float x_float, float y_float) { if (m_landManagementModule != null) { return m_landManagementModule.GetLandObject(x_float, y_float); } + ILandObject obj = new LandObject(UUID.Zero, false, m_scene); obj.landData.Name = "NO LAND"; return obj; @@ -98,6 +92,7 @@ namespace OpenSim.Region.CoreModules.World.Land { return m_landManagementModule.GetLandObject(x, y); } + ILandObject obj = new LandObject(UUID.Zero, false, m_scene); obj.landData.Name = "NO LAND"; return obj; -- cgit v1.1