diff options
author | Jeff Ames | 2008-11-01 07:21:40 +0000 |
---|---|---|
committer | Jeff Ames | 2008-11-01 07:21:40 +0000 |
commit | 337da2a7a3e330d465aef421e51729bb3df03244 (patch) | |
tree | 16826e3ab4fdf9c6ff449816fae0e23fb786615e /OpenSim/Region/Environment | |
parent | * In the client stack, if the BeginReceive() throws an exception then do prin... (diff) | |
download | opensim-SC-337da2a7a3e330d465aef421e51729bb3df03244.zip opensim-SC-337da2a7a3e330d465aef421e51729bb3df03244.tar.gz opensim-SC-337da2a7a3e330d465aef421e51729bb3df03244.tar.bz2 opensim-SC-337da2a7a3e330d465aef421e51729bb3df03244.tar.xz |
Update svn properties, minor formatting cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Chat/XIRCBridgeModule.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/XIRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/XIRCBridgeModule.cs index d7abc19..4594e6c 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/XIRCBridgeModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/XIRCBridgeModule.cs | |||
@@ -99,10 +99,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
99 | 99 | ||
100 | enabled = true; | 100 | enabled = true; |
101 | 101 | ||
102 | if(config.Configs["RemoteAdmin"] != null) | 102 | if (config.Configs["RemoteAdmin"] != null) |
103 | { | 103 | { |
104 | password = config.Configs["RemoteAdmin"].GetString("access_password", password); | 104 | password = config.Configs["RemoteAdmin"].GetString("access_password", password); |
105 | scene.CommsManager.HttpServer.AddXmlRPCHandler("xirc_admin", XmlRpcAdminMethod, false); | 105 | scene.CommsManager.HttpServer.AddXmlRPCHandler("xirc_admin", XmlRpcAdminMethod, false); |
106 | } | 106 | } |
107 | 107 | ||
108 | } | 108 | } |
@@ -224,20 +224,20 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
224 | bool found = false; | 224 | bool found = false; |
225 | string region = String.Empty; | 225 | string region = String.Empty; |
226 | 226 | ||
227 | if(password != String.Empty) | 227 | if (password != String.Empty) |
228 | { | 228 | { |
229 | if(!requestData.ContainsKey("password")) | 229 | if (!requestData.ContainsKey("password")) |
230 | throw new Exception("Invalid request"); | 230 | throw new Exception("Invalid request"); |
231 | if(requestData["password"] != password) | 231 | if (requestData["password"] != password) |
232 | throw new Exception("Invalid request"); | 232 | throw new Exception("Invalid request"); |
233 | } | 233 | } |
234 | 234 | ||
235 | if(!requestData.ContainsKey("region")) | 235 | if (!requestData.ContainsKey("region")) |
236 | throw new Exception("No region name specified"); | 236 | throw new Exception("No region name specified"); |
237 | 237 | ||
238 | foreach(RegionState rs in m_regions) | 238 | foreach (RegionState rs in m_regions) |
239 | { | 239 | { |
240 | if(rs.Region == region) | 240 | if (rs.Region == region) |
241 | { | 241 | { |
242 | responseData["server"] = rs.cs.Server; | 242 | responseData["server"] = rs.cs.Server; |
243 | responseData["port"] = rs.cs.Port; | 243 | responseData["port"] = rs.cs.Port; |
@@ -251,7 +251,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
251 | } | 251 | } |
252 | } | 252 | } |
253 | 253 | ||
254 | if(!found) throw new Exception(String.Format("Region <{0}> not found", region)); | 254 | if (!found) throw new Exception(String.Format("Region <{0}> not found", region)); |
255 | 255 | ||
256 | responseData["success"] = true; | 256 | responseData["success"] = true; |
257 | 257 | ||