diff options
author | Melanie | 2012-07-06 20:51:18 +0100 |
---|---|---|
committer | Melanie | 2012-07-06 20:51:18 +0100 |
commit | 26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2 (patch) | |
tree | bf9802d765a4965dd1b42c4b2d3145b5813c0c1f /OpenSim/Region/CoreModules/World/Land | |
parent | Merge branch 'master' into careminster (diff) | |
parent | added llSetVelocity. will refuse to work on vehicles and on attachments ( th... (diff) | |
download | opensim-SC_OLD-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.zip opensim-SC_OLD-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.gz opensim-SC_OLD-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.bz2 opensim-SC_OLD-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.xz |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index b7667b9..4f06737 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -200,7 +200,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
200 | * (long)m_scene.RegionInfo.ObjectCapacity | 200 | * (long)m_scene.RegionInfo.ObjectCapacity |
201 | * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus | 201 | * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus |
202 | / 65536L); | 202 | / 65536L); |
203 | m_log.DebugFormat("Area: {0}, Capacity {1}, Bonus {2}, Parcel {3}", LandData.Area, m_scene.RegionInfo.ObjectCapacity, m_scene.RegionInfo.RegionSettings.ObjectBonus, parcelMax); | 203 | //m_log.DebugFormat("Area: {0}, Capacity {1}, Bonus {2}, Parcel {3}", LandData.Area, m_scene.RegionInfo.ObjectCapacity, m_scene.RegionInfo.RegionSettings.ObjectBonus, parcelMax); |
204 | return parcelMax; | 204 | return parcelMax; |
205 | } | 205 | } |
206 | } | 206 | } |