aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-03-05 20:32:35 +0000
committerJustin Clarke Casey2009-03-05 20:32:35 +0000
commitc213a12b571a42478cb9908ea9d6be1cd9962ba2 (patch)
tree3788c90d03b46c989361a655b085c5e094bf5a07 /OpenSim/Region/CoreModules
parent* Replace some string to byte conversions for object/item name/description fi... (diff)
downloadopensim-SC_OLD-c213a12b571a42478cb9908ea9d6be1cd9962ba2.zip
opensim-SC_OLD-c213a12b571a42478cb9908ea9d6be1cd9962ba2.tar.gz
opensim-SC_OLD-c213a12b571a42478cb9908ea9d6be1cd9962ba2.tar.bz2
opensim-SC_OLD-c213a12b571a42478cb9908ea9d6be1cd9962ba2.tar.xz
* simplify media and music url setting since we never get back a null land object
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandChannel.cs9
1 files changed, 2 insertions, 7 deletions
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
74 74
75 #region ILandChannel Members 75 #region ILandChannel Members
76 76
77
78 /// <summary>
79 /// Get the land object at the specified point
80 /// </summary>
81 /// <param name="x_float">Value between 0 - 256 on the x axis of the point</param>
82 /// <param name="y_float">Value between 0 - 256 on the y axis of the point</param>
83 /// <returns>Land object at the point supplied</returns>
84 public ILandObject GetLandObject(float x_float, float y_float) 77 public ILandObject GetLandObject(float x_float, float y_float)
85 { 78 {
86 if (m_landManagementModule != null) 79 if (m_landManagementModule != null)
87 { 80 {
88 return m_landManagementModule.GetLandObject(x_float, y_float); 81 return m_landManagementModule.GetLandObject(x_float, y_float);
89 } 82 }
83
90 ILandObject obj = new LandObject(UUID.Zero, false, m_scene); 84 ILandObject obj = new LandObject(UUID.Zero, false, m_scene);
91 obj.landData.Name = "NO LAND"; 85 obj.landData.Name = "NO LAND";
92 return obj; 86 return obj;
@@ -98,6 +92,7 @@ namespace OpenSim.Region.CoreModules.World.Land
98 { 92 {
99 return m_landManagementModule.GetLandObject(x, y); 93 return m_landManagementModule.GetLandObject(x, y);
100 } 94 }
95
101 ILandObject obj = new LandObject(UUID.Zero, false, m_scene); 96 ILandObject obj = new LandObject(UUID.Zero, false, m_scene);
102 obj.landData.Name = "NO LAND"; 97 obj.landData.Name = "NO LAND";
103 return obj; 98 return obj;