aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/IClientAPI.cs
diff options
context:
space:
mode:
authorUbitUmarov2012-07-17 00:54:23 +0100
committerUbitUmarov2012-07-17 00:54:23 +0100
commitd5f4fb7b50fb7c594b018f8241399e22f88fc951 (patch)
tree8f3dab3d170596f02b1d1d836a0bc08a3e6b8ebd /OpenSim/Framework/IClientAPI.cs
parentUbitOde: remove useless water collider from active code. (diff)
parentMerge branch 'avination' into careminster (diff)
downloadopensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.zip
opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.gz
opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.bz2
opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.xz
Merge branch 'avination' into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/IClientAPI.cs22
1 files changed, 13 insertions, 9 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index c1bd078..58a65de 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -749,14 +749,21 @@ namespace OpenSim.Framework
749 /// </summary> 749 /// </summary>
750 string Name { get; } 750 string Name { get; }
751 751
752 /// <value> 752 /// <summary>
753 /// Determines whether the client thread is doing anything or not. 753 /// True if the client is active (sending and receiving new UDP messages). False if the client is being closed.
754 /// </value> 754 /// </summary>
755 bool IsActive { get; set; } 755 bool IsActive { get; set; }
756 756
757 /// <value> 757 /// <summary>
758 /// Determines whether the client is or has been removed from a given scene 758 /// Set if the client is closing due to a logout request
759 /// </value> 759 /// </summary>
760 /// <remarks>
761 /// Do not use this flag if you want to know if the client is closing, since it will not be set in other
762 /// circumstances (e.g. if a child agent is closed or the agent is kicked off the simulator). Use IsActive
763 /// instead with a IClientAPI.SceneAgent.IsChildAgent check if necessary.
764 ///
765 /// Only set for root agents.
766 /// </remarks>
760 bool IsLoggingOut { get; set; } 767 bool IsLoggingOut { get; set; }
761 768
762 bool SendLogoutPacketWhenClosing { set; } 769 bool SendLogoutPacketWhenClosing { set; }
@@ -1362,7 +1369,6 @@ namespace OpenSim.Framework
1362 void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message); 1369 void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message);
1363 1370
1364 void SendLogoutPacket(); 1371 void SendLogoutPacket();
1365 EndPoint GetClientEP();
1366 1372
1367 // WARNING WARNING WARNING 1373 // WARNING WARNING WARNING
1368 // 1374 //
@@ -1423,8 +1429,6 @@ namespace OpenSim.Framework
1423 1429
1424 void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes); 1430 void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes);
1425 1431
1426 void KillEndDone();
1427
1428 bool AddGenericPacketHandler(string MethodName, GenericMessage handler); 1432 bool AddGenericPacketHandler(string MethodName, GenericMessage handler);
1429 1433
1430 void SendRebakeAvatarTextures(UUID textureID); 1434 void SendRebakeAvatarTextures(UUID textureID);