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/OptionalModules/World/NPC/NPCAvatar.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-329fa73695b496a30e9192888371855802769a16.zip
opensim-SC-329fa73695b496a30e9192888371855802769a16.tar.gz
opensim-SC-329fa73695b496a30e9192888371855802769a16.tar.bz2
opensim-SC-329fa73695b496a30e9192888371855802769a16.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 1ce3791..227450d 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -930,7 +930,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
        {
        }
-        public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
+        public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
        {
        }
        public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID)
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/OptionalModules/World/NPC/NPCAvatar.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-329fa73695b496a30e9192888371855802769a16.zip opensim-SC-329fa73695b496a30e9192888371855802769a16.tar.gz opensim-SC-329fa73695b496a30e9192888371855802769a16.tar.bz2 opensim-SC-329fa73695b496a30e9192888371855802769a16.tar.xz

diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 1ce3791..227450d 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -930,7 +930,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
930	{	930	{
931	}	931	}
932		932
933	public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)	933	public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
934	{	934	{
935	}	935	}
936	public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID)	936	public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID)