aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController
diff options
context:
space:
mode:
authorlbsa712008-09-08 14:30:35 +0000
committerlbsa712008-09-08 14:30:35 +0000
commit8388fe0669f9d140028d1925284491b21a09a1bf (patch)
tree80c7729bef9b88a371c3f561322a97faf262ade6 /OpenSim/ApplicationPlugins/RemoteController
parentMantis #2144 (diff)
downloadopensim-SC_OLD-8388fe0669f9d140028d1925284491b21a09a1bf.zip
opensim-SC_OLD-8388fe0669f9d140028d1925284491b21a09a1bf.tar.gz
opensim-SC_OLD-8388fe0669f9d140028d1925284491b21a09a1bf.tar.bz2
opensim-SC_OLD-8388fe0669f9d140028d1925284491b21a09a1bf.tar.xz
* some if inversions and added {}'s for readability
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs12
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 7803d92..9451f00 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -71,8 +71,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
71 m_configSource = openSim.ConfigSource.Source; 71 m_configSource = openSim.ConfigSource.Source;
72 try 72 try
73 { 73 {
74 if (m_configSource.Configs["RemoteAdmin"] != null && 74 if (m_configSource.Configs["RemoteAdmin"] == null ||
75 m_configSource.Configs["RemoteAdmin"].GetBoolean("enabled", false)) 75 !m_configSource.Configs["RemoteAdmin"].GetBoolean("enabled", false))
76 {
77 // No config or disabled
78 }
79 else
76 { 80 {
77 m_config = m_configSource.Configs["RemoteAdmin"]; 81 m_config = m_configSource.Configs["RemoteAdmin"];
78 m_log.Info("[RADMIN]: Remote Admin Plugin Enabled"); 82 m_log.Info("[RADMIN]: Remote Admin Plugin Enabled");
@@ -110,8 +114,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
110 checkStringParameters(request, new string[] { "password", "regionID" }); 114 checkStringParameters(request, new string[] { "password", "regionID" });
111 115
112 if (requiredPassword != String.Empty && 116 if (requiredPassword != String.Empty &&
113 (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) 117 (!requestData.Contains("password") || (string)requestData["password"] != requiredPassword))
118 {
114 throw new Exception("wrong password"); 119 throw new Exception("wrong password");
120 }
115 121
116 UUID regionID = new UUID((string) requestData["regionID"]); 122 UUID regionID = new UUID((string) requestData["regionID"]);
117 123