diff options
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs | 30 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 14 |
2 files changed, 36 insertions, 8 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs index ffb3e48..638ed33 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs | |||
@@ -1,3 +1,31 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | |||
1 | using System.Reflection; | 29 | using System.Reflection; |
2 | using System.Runtime.InteropServices; | 30 | using System.Runtime.InteropServices; |
3 | 31 | ||
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices; | |||
10 | [assembly : AssemblyConfiguration("")] | 38 | [assembly : AssemblyConfiguration("")] |
11 | [assembly : AssemblyCompany("")] | 39 | [assembly : AssemblyCompany("")] |
12 | [assembly : AssemblyProduct("OpenSim.Addin")] | 40 | [assembly : AssemblyProduct("OpenSim.Addin")] |
13 | [assembly : AssemblyCopyright("Copyright © 2007")] | 41 | [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] |
14 | [assembly : AssemblyTrademark("")] | 42 | [assembly : AssemblyTrademark("")] |
15 | [assembly : AssemblyCulture("")] | 43 | [assembly : AssemblyCulture("")] |
16 | 44 | ||
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index cce58c2..fa76078 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -48,7 +48,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
48 | { | 48 | { |
49 | private OpenSimMain m_app; | 49 | private OpenSimMain m_app; |
50 | private BaseHttpServer m_httpd; | 50 | private BaseHttpServer m_httpd; |
51 | private string requiredPassword = ""; | 51 | private string requiredPassword = String.Empty; |
52 | 52 | ||
53 | public void Initialise(OpenSimMain openSim) | 53 | public void Initialise(OpenSimMain openSim) |
54 | { | 54 | { |
@@ -57,7 +57,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
57 | if (openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false)) | 57 | if (openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false)) |
58 | { | 58 | { |
59 | MainLog.Instance.Verbose("RADMIN", "Remote Admin Plugin Enabled"); | 59 | MainLog.Instance.Verbose("RADMIN", "Remote Admin Plugin Enabled"); |
60 | requiredPassword = openSim.ConfigSource.Configs["RemoteAdmin"].GetString("access_password", ""); | 60 | requiredPassword = openSim.ConfigSource.Configs["RemoteAdmin"].GetString("access_password", String.Empty); |
61 | 61 | ||
62 | m_app = openSim; | 62 | m_app = openSim; |
63 | m_httpd = openSim.HttpServer; | 63 | m_httpd = openSim.HttpServer; |
@@ -83,7 +83,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
83 | LLUUID regionID = new LLUUID((string) requestData["regionID"]); | 83 | LLUUID regionID = new LLUUID((string) requestData["regionID"]); |
84 | 84 | ||
85 | Hashtable responseData = new Hashtable(); | 85 | Hashtable responseData = new Hashtable(); |
86 | if (requiredPassword != "" && | 86 | if (requiredPassword != String.Empty && |
87 | (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) | 87 | (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) |
88 | { | 88 | { |
89 | responseData["accepted"] = "false"; | 89 | responseData["accepted"] = "false"; |
@@ -116,7 +116,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
116 | Hashtable requestData = (Hashtable) request.Params[0]; | 116 | Hashtable requestData = (Hashtable) request.Params[0]; |
117 | 117 | ||
118 | Hashtable responseData = new Hashtable(); | 118 | Hashtable responseData = new Hashtable(); |
119 | if (requiredPassword != "" && | 119 | if (requiredPassword != String.Empty && |
120 | (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) | 120 | (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) |
121 | { | 121 | { |
122 | responseData["accepted"] = "false"; | 122 | responseData["accepted"] = "false"; |
@@ -142,7 +142,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
142 | Hashtable requestData = (Hashtable)request.Params[0]; | 142 | Hashtable requestData = (Hashtable)request.Params[0]; |
143 | 143 | ||
144 | Hashtable responseData = new Hashtable(); | 144 | Hashtable responseData = new Hashtable(); |
145 | if (requiredPassword != "" && | 145 | if (requiredPassword != String.Empty && |
146 | (!requestData.Contains("password") || (string)requestData["password"] != requiredPassword)) | 146 | (!requestData.Contains("password") || (string)requestData["password"] != requiredPassword)) |
147 | { | 147 | { |
148 | responseData["accepted"] = "false"; | 148 | responseData["accepted"] = "false"; |
@@ -180,7 +180,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
180 | XmlRpcResponse response = new XmlRpcResponse(); | 180 | XmlRpcResponse response = new XmlRpcResponse(); |
181 | Hashtable requestData = (Hashtable) request.Params[0]; | 181 | Hashtable requestData = (Hashtable) request.Params[0]; |
182 | Hashtable responseData = new Hashtable(); | 182 | Hashtable responseData = new Hashtable(); |
183 | if (requiredPassword != "" && | 183 | if (requiredPassword != String.Empty && |
184 | (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) | 184 | (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) |
185 | { | 185 | { |
186 | responseData["accepted"] = "false"; | 186 | responseData["accepted"] = "false"; |
@@ -236,7 +236,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
236 | XmlRpcResponse response = new XmlRpcResponse(); | 236 | XmlRpcResponse response = new XmlRpcResponse(); |
237 | Hashtable requestData = (Hashtable) request.Params[0]; | 237 | Hashtable requestData = (Hashtable) request.Params[0]; |
238 | Hashtable responseData = new Hashtable(); | 238 | Hashtable responseData = new Hashtable(); |
239 | if (requiredPassword != "" && | 239 | if (requiredPassword != System.String.Empty && |
240 | (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) | 240 | (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) |
241 | { | 241 | { |
242 | responseData["created"] = "false"; | 242 | responseData["created"] = "false"; |