diff options
author | John Hurliman | 2010-03-12 14:28:31 -0800 |
---|---|---|
committer | John Hurliman | 2010-03-12 14:28:31 -0800 |
commit | 3036aba875187923b4e4d8481d46334e53393107 (patch) | |
tree | 4aa2b5ba3687873e0be69cee84a0652c9f2dd136 /OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs | |
parent | Fixing the previous patch to work correctly with standalone mode (diff) | |
download | opensim-SC_OLD-3036aba875187923b4e4d8481d46334e53393107.zip opensim-SC_OLD-3036aba875187923b4e4d8481d46334e53393107.tar.gz opensim-SC_OLD-3036aba875187923b4e4d8481d46334e53393107.tar.bz2 opensim-SC_OLD-3036aba875187923b4e4d8481d46334e53393107.tar.xz |
* Added a better check to the SimianGrid connectors to test if they are enabled or not. This method should work equally well with standalone or robust mode
* Applying #4602 from Misterblu to add collision detection to BulletDotNET
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs index 41ed2f1..c3de98e 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs | |||
@@ -25,7 +25,23 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
28 | using Mono.Addins; | 29 | using Mono.Addins; |
30 | using Nini.Config; | ||
29 | 31 | ||
30 | [assembly: Addin("SimianGrid", "1.0")] | 32 | [assembly: Addin("SimianGrid", "1.0")] |
31 | [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) | ||
38 | { | ||
39 | if (config.Configs["Modules"] != null) | ||
40 | { | ||
41 | string module = config.Configs["Modules"].GetString("AuthenticationServices"); | ||
42 | return !String.IsNullOrEmpty(module) && module.Contains("Simian"); | ||
43 | } | ||
44 | |||
45 | return false; | ||
46 | } | ||
47 | } \ No newline at end of file | ||