diff options
author | John Hurliman | 2010-09-03 13:36:35 -0700 |
---|---|---|
committer | John Hurliman | 2010-09-03 13:36:35 -0700 |
commit | 4f79143f3f058b0570c073b668f4ea088e541a43 (patch) | |
tree | f95d821dc052c8a66b66a49fe413c6cce639dec3 /OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-4f79143f3f058b0570c073b668f4ea088e541a43.zip opensim-SC-4f79143f3f058b0570c073b668f4ea088e541a43.tar.gz opensim-SC-4f79143f3f058b0570c073b668f4ea088e541a43.tar.bz2 opensim-SC-4f79143f3f058b0570c073b668f4ea088e541a43.tar.xz |
* Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors to handle initialization as graceful as possible with the current broken way region module initialization is done
* Added config-include/HyperSimianGrid.ini option for connecting to SimianGrid with HyperGrid enabled (work in progress on the SimianGrid side)
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs index 7d97aaa..847319c 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs | |||
@@ -31,17 +31,3 @@ using Nini.Config; | |||
31 | 31 | ||
32 | [assembly: Addin("SimianGrid", "1.0")] | 32 | [assembly: Addin("SimianGrid", "1.0")] |
33 | [assembly: AddinDependency("OpenSim", "0.5")] | 33 | [assembly: AddinDependency("OpenSim", "0.5")] |
34 | |||
35 | public static class Simian | ||
36 | { | ||
37 | public static bool IsSimianEnabled(IConfigSource config, string moduleName, string connectorName) | ||
38 | { | ||
39 | if (config.Configs["Modules"] != null) | ||
40 | { | ||
41 | string module = config.Configs["Modules"].GetString(moduleName); | ||
42 | return !String.IsNullOrEmpty(module) && module.EndsWith(connectorName); | ||
43 | } | ||
44 | |||
45 | return false; | ||
46 | } | ||
47 | } \ No newline at end of file | ||