Merge branch 'master' into careminster-presence-refactor

author: Melanie 2011-04-01 07:44:43 +0100
committer: Melanie 2011-04-01 07:44:43 +0100
commit: 329fa73695b496a30e9192888371855802769a16 (patch)
tree: f581712c3317119b70005beecbe7e4a8d86fb6bc /OpenSim/Region/CoreModules/World/Land/LandObject.cs
parent: Make the login service's call to the sim time out quicker so we have a (diff)
parent: When a new parcel is created, make sure the prim counts are updated. (diff)
download: opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.zip
opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.gz
opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.bz2
opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.xz
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 1e824bd..e87153b 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.World.Land
            }
            remote_client.SendLandProperties(seq_id,
-                    snap_selection, request_result, LandData,
+                    snap_selection, request_result, this,
                    (float)m_scene.RegionInfo.RegionSettings.ObjectBonus,
                    GetParcelMaxPrimCount(this),
                    GetSimulatorMaxPrimCount(this), regionFlags);
author	Melanie	2011-04-01 07:44:43 +0100
committer	Melanie	2011-04-01 07:44:43 +0100
commit	329fa73695b496a30e9192888371855802769a16 (patch)
tree	f581712c3317119b70005beecbe7e4a8d86fb6bc /OpenSim/Region/CoreModules/World/Land/LandObject.cs
parent	Make the login service's call to the sim time out quicker so we have a (diff)
parent	When a new parcel is created, make sure the prim counts are updated. (diff)
download	opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.zip opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.gz opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.bz2 opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.xz

diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 1e824bd..e87153b 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.World.Land
243	}	243	}
244		244
245	remote_client.SendLandProperties(seq_id,	245	remote_client.SendLandProperties(seq_id,
246	snap_selection, request_result, LandData,	246	snap_selection, request_result, this,
247	(float)m_scene.RegionInfo.RegionSettings.ObjectBonus,	247	(float)m_scene.RegionInfo.RegionSettings.ObjectBonus,
248	GetParcelMaxPrimCount(this),	248	GetParcelMaxPrimCount(this),
249	GetSimulatorMaxPrimCount(this), regionFlags);	249	GetSimulatorMaxPrimCount(this), regionFlags);