diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs | |
parent | Add a build script. (diff) | |
download | opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs index 764e71f..49bd9a4 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
55 | private bool m_enabled = true; | 55 | private bool m_enabled = true; |
56 | private Scene m_scene; | 56 | private Scene m_scene; |
57 | private String m_simianURL; | 57 | private String m_simianURL; |
58 | 58 | ||
59 | #region IRegionModule Members | 59 | #region IRegionModule Members |
60 | 60 | ||
61 | public string Name | 61 | public string Name |
@@ -65,10 +65,10 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
65 | 65 | ||
66 | public void Initialise(IConfigSource config) | 66 | public void Initialise(IConfigSource config) |
67 | { | 67 | { |
68 | try | 68 | try |
69 | { | 69 | { |
70 | IConfig m_config; | 70 | IConfig m_config; |
71 | 71 | ||
72 | if ((m_config = config.Configs["SimianExternalCaps"]) != null) | 72 | if ((m_config = config.Configs["SimianExternalCaps"]) != null) |
73 | { | 73 | { |
74 | m_enabled = m_config.GetBoolean("Enabled", m_enabled); | 74 | m_enabled = m_config.GetBoolean("Enabled", m_enabled); |
@@ -97,10 +97,10 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
97 | public void Close() { } | 97 | public void Close() { } |
98 | 98 | ||
99 | public void AddRegion(Scene scene) | 99 | public void AddRegion(Scene scene) |
100 | { | 100 | { |
101 | if (! m_enabled) | 101 | if (! m_enabled) |
102 | return; | 102 | return; |
103 | 103 | ||
104 | m_scene = scene; | 104 | m_scene = scene; |
105 | m_scene.RegisterModuleInterface<IExternalCapsModule>(this); | 105 | m_scene.RegisterModuleInterface<IExternalCapsModule>(this); |
106 | } | 106 | } |
@@ -153,7 +153,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
153 | subs["%USR%"] = agentID.ToString(); | 153 | subs["%USR%"] = agentID.ToString(); |
154 | subs["%CAP%"] = cap.ToString(); | 154 | subs["%CAP%"] = cap.ToString(); |
155 | subs["%SIM%"] = m_scene.RegionInfo.RegionID.ToString(); | 155 | subs["%SIM%"] = m_scene.RegionInfo.RegionID.ToString(); |
156 | 156 | ||
157 | caps.RegisterHandler(capName,ExpandSkeletonURL(urlSkel,subs)); | 157 | caps.RegisterHandler(capName,ExpandSkeletonURL(urlSkel,subs)); |
158 | return true; | 158 | return true; |
159 | } | 159 | } |
@@ -168,12 +168,12 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
168 | private String ExpandSkeletonURL(String urlSkel, Dictionary<String,String> subs) | 168 | private String ExpandSkeletonURL(String urlSkel, Dictionary<String,String> subs) |
169 | { | 169 | { |
170 | String result = urlSkel; | 170 | String result = urlSkel; |
171 | 171 | ||
172 | foreach (KeyValuePair<String,String> kvp in subs) | 172 | foreach (KeyValuePair<String,String> kvp in subs) |
173 | { | 173 | { |
174 | result = result.Replace(kvp.Key,kvp.Value); | 174 | result = result.Replace(kvp.Key,kvp.Value); |
175 | } | 175 | } |
176 | 176 | ||
177 | return result; | 177 | return result; |
178 | } | 178 | } |
179 | } | 179 | } |