diff options
author | Melanie | 2012-08-23 01:41:47 +0100 |
---|---|---|
committer | Melanie | 2012-08-23 01:41:47 +0100 |
commit | f8603a215d142f3b83a5ff1dc022b716b3e48f99 (patch) | |
tree | 49971f8e12efcfea18b4b2fdb6bd54c904d3f52c /OpenSim/Framework/IClientAPI.cs | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | this should be an if-else block in case the non-phys min/max are smaller than... (diff) | |
download | opensim-SC_OLD-f8603a215d142f3b83a5ff1dc022b716b3e48f99.zip opensim-SC_OLD-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.gz opensim-SC_OLD-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.bz2 opensim-SC_OLD-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 6be2bd7..91f36a5 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -1046,8 +1046,21 @@ namespace OpenSim.Framework | |||
1046 | 1046 | ||
1047 | void InPacket(object NewPack); | 1047 | void InPacket(object NewPack); |
1048 | void ProcessInPacket(Packet NewPack); | 1048 | void ProcessInPacket(Packet NewPack); |
1049 | |||
1050 | /// <summary> | ||
1051 | /// Close this client | ||
1052 | /// </summary> | ||
1049 | void Close(); | 1053 | void Close(); |
1050 | void Close(bool sendStop); | 1054 | |
1055 | /// <summary> | ||
1056 | /// Close this client | ||
1057 | /// </summary> | ||
1058 | /// <param name='force'> | ||
1059 | /// If true, attempts the close without checking active status. You do not want to try this except as a last | ||
1060 | /// ditch attempt where Active == false but the ScenePresence still exists. | ||
1061 | /// </param> | ||
1062 | void Close(bool sendStop, bool force); | ||
1063 | |||
1051 | void Kick(string message); | 1064 | void Kick(string message); |
1052 | 1065 | ||
1053 | /// <summary> | 1066 | /// <summary> |