aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General
diff options
context:
space:
mode:
authorlbsa712007-09-25 06:33:18 +0000
committerlbsa712007-09-25 06:33:18 +0000
commiteb8640f368ab43b27395690404e845f09366c652 (patch)
tree736cca5f1e34fddfe1291046797547e4367afdb6 /OpenSim/Framework/General
parent* Fixed Culture-variant parsing of config options (diff)
downloadopensim-SC_OLD-eb8640f368ab43b27395690404e845f09366c652.zip
opensim-SC_OLD-eb8640f368ab43b27395690404e845f09366c652.tar.gz
opensim-SC_OLD-eb8640f368ab43b27395690404e845f09366c652.tar.bz2
opensim-SC_OLD-eb8640f368ab43b27395690404e845f09366c652.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Framework/General')
-rw-r--r--OpenSim/Framework/General/ClientManager.cs5
-rw-r--r--OpenSim/Framework/General/Configuration/ConfigurationMember.cs1
-rw-r--r--OpenSim/Framework/General/Interfaces/IScene.cs5
3 files changed, 10 insertions, 1 deletions
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
100 } 100 }
101 } 101 }
102 } 102 }
103
104 public bool TryGetClient(uint circuitId, out IClientAPI user)
105 {
106 return m_clients.TryGetValue(circuitId, out user);
107 }
103 } 108 }
104} 109}
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
116 configurationPlugin.LoadData(); 116 configurationPlugin.LoadData();
117 useFile = true; 117 useFile = true;
118 } 118 }
119
120 else 119 else
121 { 120 {
122 MainLog.Instance.Notice("XML Configuration Filename is not valid; will not save to the file."); 121 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
38 RegionInfo RegionInfo { get; } 38 RegionInfo RegionInfo { get; }
39 object SyncRoot { get; } 39 object SyncRoot { get; }
40 uint NextLocalId { get; } 40 uint NextLocalId { get; }
41
42 ClientManager ClientManager
43 {
44 get;
45 }
41 } 46 }
42} 47}