From eb8640f368ab43b27395690404e845f09366c652 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Tue, 25 Sep 2007 06:33:18 +0000 Subject: * Now the OGS1GridServices has a LocalBackEndServices that it forwards intra-instance requests to * Every Scene has a ClientManager (as every dog it's day) since two scenes can have the same circuit as client. --- OpenSim/Framework/General/ClientManager.cs | 5 +++++ OpenSim/Framework/General/Configuration/ConfigurationMember.cs | 1 - OpenSim/Framework/General/Interfaces/IScene.cs | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'OpenSim/Framework/General') diff --git a/OpenSim/Framework/General/ClientManager.cs b/OpenSim/Framework/General/ClientManager.cs index b032849..7cf0aea 100644 --- a/OpenSim/Framework/General/ClientManager.cs +++ b/OpenSim/Framework/General/ClientManager.cs @@ -100,5 +100,10 @@ namespace OpenSim.Framework } } } + + public bool TryGetClient(uint circuitId, out IClientAPI user) + { + return m_clients.TryGetValue(circuitId, out user); + } } } diff --git a/OpenSim/Framework/General/Configuration/ConfigurationMember.cs b/OpenSim/Framework/General/Configuration/ConfigurationMember.cs index e4c13ba..e421ba5 100644 --- a/OpenSim/Framework/General/Configuration/ConfigurationMember.cs +++ b/OpenSim/Framework/General/Configuration/ConfigurationMember.cs @@ -116,7 +116,6 @@ namespace OpenSim.Framework.Configuration configurationPlugin.LoadData(); useFile = true; } - else { MainLog.Instance.Notice("XML Configuration Filename is not valid; will not save to the file."); diff --git a/OpenSim/Framework/General/Interfaces/IScene.cs b/OpenSim/Framework/General/Interfaces/IScene.cs index 6140918..e3e65f1 100644 --- a/OpenSim/Framework/General/Interfaces/IScene.cs +++ b/OpenSim/Framework/General/Interfaces/IScene.cs @@ -38,5 +38,10 @@ namespace OpenSim.Framework.Interfaces RegionInfo RegionInfo { get; } object SyncRoot { get; } uint NextLocalId { get; } + + ClientManager ClientManager + { + get; + } } } -- cgit v1.1