diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs index a35d749..b29adb3 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs | |||
@@ -52,20 +52,20 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
52 | private IConfig m_config = null; | 52 | private IConfig m_config = null; |
53 | 53 | ||
54 | private String m_simianURL; | 54 | private String m_simianURL; |
55 | 55 | ||
56 | #region IRegionModule Members | 56 | #region IRegionModule Members |
57 | 57 | ||
58 | public string Name | 58 | public string Name |
59 | { | 59 | { |
60 | get { return this.GetType().Name; } | 60 | get { return this.GetType().Name; } |
61 | } | 61 | } |
62 | 62 | ||
63 | public void Initialise(IConfigSource config) | 63 | public void Initialise(IConfigSource config) |
64 | { | 64 | { |
65 | try | 65 | try |
66 | { | 66 | { |
67 | m_config = config.Configs["SimianGrid"]; | 67 | m_config = config.Configs["SimianGrid"]; |
68 | 68 | ||
69 | if (m_config != null) | 69 | if (m_config != null) |
70 | { | 70 | { |
71 | m_simianURL = m_config.GetString("SimianServiceURL"); | 71 | m_simianURL = m_config.GetString("SimianServiceURL"); |
@@ -74,7 +74,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
74 | // m_log.DebugFormat("[SimianGrid] service URL is not defined"); | 74 | // m_log.DebugFormat("[SimianGrid] service URL is not defined"); |
75 | return; | 75 | return; |
76 | } | 76 | } |
77 | 77 | ||
78 | InitialiseSimCap(); | 78 | InitialiseSimCap(); |
79 | SimulatorCapability = SimulatorCapability.Trim(); | 79 | SimulatorCapability = SimulatorCapability.Trim(); |
80 | m_log.InfoFormat("[SimianExternalCaps] using {0} as simulator capability",SimulatorCapability); | 80 | m_log.InfoFormat("[SimianExternalCaps] using {0} as simulator capability",SimulatorCapability); |
@@ -100,7 +100,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
100 | 100 | ||
101 | ///<summary> | 101 | ///<summary> |
102 | /// Try a variety of methods for finding the simian simulator capability; first check the | 102 | /// Try a variety of methods for finding the simian simulator capability; first check the |
103 | /// configuration itself, then look for a file that contains the cap, then finally look | 103 | /// configuration itself, then look for a file that contains the cap, then finally look |
104 | /// for an environment variable that contains it. | 104 | /// for an environment variable that contains it. |
105 | ///</summary> | 105 | ///</summary> |
106 | private void InitialiseSimCap() | 106 | private void InitialiseSimCap() |
@@ -110,7 +110,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
110 | SimulatorCapability = m_config.GetString("SimulatorCapability"); | 110 | SimulatorCapability = m_config.GetString("SimulatorCapability"); |
111 | return; | 111 | return; |
112 | } | 112 | } |
113 | 113 | ||
114 | if (m_config.Contains("SimulatorCapabilityFile")) | 114 | if (m_config.Contains("SimulatorCapabilityFile")) |
115 | { | 115 | { |
116 | String filename = m_config.GetString("SimulatorCapabilityFile"); | 116 | String filename = m_config.GetString("SimulatorCapabilityFile"); |
@@ -120,7 +120,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
120 | return; | 120 | return; |
121 | } | 121 | } |
122 | } | 122 | } |
123 | 123 | ||
124 | if (m_config.Contains("SimulatorCapabilityVariable")) | 124 | if (m_config.Contains("SimulatorCapabilityVariable")) |
125 | { | 125 | { |
126 | String envname = m_config.GetString("SimulatorCapabilityVariable"); | 126 | String envname = m_config.GetString("SimulatorCapabilityVariable"); |
@@ -134,7 +134,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
134 | 134 | ||
135 | m_log.WarnFormat("[SimianExternalCaps] no method specified for simulator capability"); | 135 | m_log.WarnFormat("[SimianExternalCaps] no method specified for simulator capability"); |
136 | } | 136 | } |
137 | 137 | ||
138 | #endregion | 138 | #endregion |
139 | 139 | ||
140 | public static String SimulatorCapability = UUID.Zero.ToString(); | 140 | public static String SimulatorCapability = UUID.Zero.ToString(); |