Merge branch 'htb-throttle'

author: Melanie 2009-10-08 08:07:38 +0100
committer: Melanie 2009-10-08 08:07:38 +0100
commit: fe679be9e76190ac0dc8892469787e63a7a48b5c (patch)
tree: 220ef33da75f09b3e7ef3684c5ed7367e175691e /OpenSim/Region/ClientStack/IClientNetworkServer.cs
parent: store owner_uuid in the region table (diff)
parent: One last attempt at tunning the locking/no locking behaviour. The previous on... (diff)
download: opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.zip
opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.gz
opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.bz2
opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/IClientNetworkServer.cs b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
index a71ad4d..54a441b 100644
--- a/OpenSim/Region/ClientStack/IClientNetworkServer.cs
+++ b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.ClientStack
            IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, 
            AgentCircuitManager authenticateClass);
-        Socket Server { get; }
+        void NetworkStop();
        bool HandlesRegion(Location x);
        void AddScene(IScene x);
author	Melanie	2009-10-08 08:07:38 +0100
committer	Melanie	2009-10-08 08:07:38 +0100
commit	fe679be9e76190ac0dc8892469787e63a7a48b5c (patch)
tree	220ef33da75f09b3e7ef3684c5ed7367e175691e /OpenSim/Region/ClientStack/IClientNetworkServer.cs
parent	store owner_uuid in the region table (diff)
parent	One last attempt at tunning the locking/no locking behaviour. The previous on... (diff)
download	opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.zip opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.gz opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.bz2 opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.xz

diff --git a/OpenSim/Region/ClientStack/IClientNetworkServer.cs b/OpenSim/Region/ClientStack/IClientNetworkServer.cs index a71ad4d..54a441b 100644 --- a/OpenSim/Region/ClientStack/IClientNetworkServer.cs +++ b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.ClientStack
38	IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource,	38	IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource,
39	AgentCircuitManager authenticateClass);	39	AgentCircuitManager authenticateClass);
40		40
41	Socket Server { get; }	41	void NetworkStop();
42	bool HandlesRegion(Location x);	42	bool HandlesRegion(Location x);
43	void AddScene(IScene x);	43	void AddScene(IScene x);
44		44