aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/IClientAPI.cs
diff options
context:
space:
mode:
authorBlueWall2012-02-03 18:20:26 -0500
committerBlueWall2012-02-03 18:20:26 -0500
commit0742630d813259483f0e56d1c6b807de78924c54 (patch)
tree8dacf402c0cd7065403f1f8c9735214825011448 /OpenSim/Framework/IClientAPI.cs
parentExtend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene ... (diff)
parentFix: Covenant changed time not set http://opensimulator.org/mantis/view.php?i... (diff)
downloadopensim-SC_OLD-0742630d813259483f0e56d1c6b807de78924c54.zip
opensim-SC_OLD-0742630d813259483f0e56d1c6b807de78924c54.tar.gz
opensim-SC_OLD-0742630d813259483f0e56d1c6b807de78924c54.tar.bz2
opensim-SC_OLD-0742630d813259483f0e56d1c6b807de78924c54.tar.xz
Merge branch 'master' of /home/opensim/src/opensim
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index dd3e656..c85e599 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1235,7 +1235,7 @@ namespace OpenSim.Framework
1235 void SendEstateCovenantInformation(UUID covenant); 1235 void SendEstateCovenantInformation(UUID covenant);
1236 1236
1237 void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, 1237 void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags,
1238 uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner); 1238 uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner);
1239 1239
1240 /// <summary> 1240 /// <summary>
1241 /// Send land properties to the client. 1241 /// Send land properties to the client.