From b25f9f322cdbcde7fd8c043137bf07992e5ef318 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Tue, 15 Jan 2008 02:09:55 +0000 Subject: * Mother of all commits: * Cleaned up copyright notices in AssemblyInfo.cs's * Added Copyright headers to a bunch of files missing them * Replaced several common string instances with a static constant to prevent reallocation of the same strings thousands of times. "" -> String.Empty is the first such candidate. --- .../LoadRegions/Properties/AssemblyInfo.cs | 30 +++++++++++++++++++++- .../RemoteController/RemoteAdminPlugin.cs | 14 +++++----- 2 files changed, 36 insertions(+), 8 deletions(-) (limited to 'OpenSim/ApplicationPlugins') 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 @@ +/* +* Copyright (c) Contributors, http://opensimulator.org/ +* See CONTRIBUTORS.TXT for a full list of copyright holders. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of the OpenSim Project nor the +* names of its contributors may be used to endorse or promote products +* derived from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY +* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY +* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +*/ + using System.Reflection; using System.Runtime.InteropServices; @@ -10,7 +38,7 @@ using System.Runtime.InteropServices; [assembly : AssemblyConfiguration("")] [assembly : AssemblyCompany("")] [assembly : AssemblyProduct("OpenSim.Addin")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] 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 { private OpenSimMain m_app; private BaseHttpServer m_httpd; - private string requiredPassword = ""; + private string requiredPassword = String.Empty; public void Initialise(OpenSimMain openSim) { @@ -57,7 +57,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions if (openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false)) { MainLog.Instance.Verbose("RADMIN", "Remote Admin Plugin Enabled"); - requiredPassword = openSim.ConfigSource.Configs["RemoteAdmin"].GetString("access_password", ""); + requiredPassword = openSim.ConfigSource.Configs["RemoteAdmin"].GetString("access_password", String.Empty); m_app = openSim; m_httpd = openSim.HttpServer; @@ -83,7 +83,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions LLUUID regionID = new LLUUID((string) requestData["regionID"]); Hashtable responseData = new Hashtable(); - if (requiredPassword != "" && + if (requiredPassword != String.Empty && (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) { responseData["accepted"] = "false"; @@ -116,7 +116,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions Hashtable requestData = (Hashtable) request.Params[0]; Hashtable responseData = new Hashtable(); - if (requiredPassword != "" && + if (requiredPassword != String.Empty && (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) { responseData["accepted"] = "false"; @@ -142,7 +142,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions Hashtable requestData = (Hashtable)request.Params[0]; Hashtable responseData = new Hashtable(); - if (requiredPassword != "" && + if (requiredPassword != String.Empty && (!requestData.Contains("password") || (string)requestData["password"] != requiredPassword)) { responseData["accepted"] = "false"; @@ -180,7 +180,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable) request.Params[0]; Hashtable responseData = new Hashtable(); - if (requiredPassword != "" && + if (requiredPassword != String.Empty && (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) { responseData["accepted"] = "false"; @@ -236,7 +236,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable) request.Params[0]; Hashtable responseData = new Hashtable(); - if (requiredPassword != "" && + if (requiredPassword != System.String.Empty && (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) { responseData["created"] = "false"; -- cgit v1.1