aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/IClientAPI.cs
diff options
context:
space:
mode:
authorMelanie2011-04-01 07:44:43 +0100
committerMelanie2011-04-01 07:44:43 +0100
commit329fa73695b496a30e9192888371855802769a16 (patch)
treef581712c3317119b70005beecbe7e4a8d86fb6bc /OpenSim/Framework/IClientAPI.cs
parentMake the login service's call to the sim time out quicker so we have a (diff)
parentWhen a new parcel is created, make sure the prim counts are updated. (diff)
downloadopensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.zip
opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.gz
opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.bz2
opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
-rw-r--r--OpenSim/Framework/IClientAPI.cs12
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 3f77092..6ec69d3 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1148,7 +1148,17 @@ namespace OpenSim.Framework
1148 void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, 1148 void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags,
1149 uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner); 1149 uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner);
1150 1150
1151 void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, 1151 /// <summary>
1152 /// Send land properties to the client.
1153 /// </summary>
1154 /// <param name="sequence_id"></param>
1155 /// <param name="snap_selection"></param>
1156 /// <param name="request_result"></param>
1157 /// <param name="lo"></param></param>
1158 /// <param name="parcelObjectCapacity">/param>
1159 /// <param name="simObjectCapacity"></param>
1160 /// <param name="regionFlags"></param>
1161 void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo,
1152 float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, 1162 float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity,
1153 uint regionFlags); 1163 uint regionFlags);
1154 1164