ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Mother of all commits:

Browse Source 
* 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.
This commit is contained in:
Adam Frisby
2008-01-15 02:09:55 +00:00
parent 84c3a317c1
commit b25f9f322c
121 changed files with 973 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Application/Application.cs
View File

@@ -45,7 +45,7 @@ namespace OpenSim
Console.Write("Performing compatibility checks... ");
string supported = "";
string supported = String.Empty;
if (Util.IsEnvironmentSupported(ref supported))
{
Console.WriteLine(" Environment is compatible.\n");
@@ -90,7 +90,7 @@ namespace OpenSim
// TODO: Add config option to allow users to turn off error reporting
// TODO: Post error report (disabled for now)
string msg = "";
string msg = String.Empty;
msg += "\r\n";
msg += "APPLICATION EXCEPTION DETECTED: " + e.ToString() + "\r\n";
msg += "\r\n";

22
OpenSim/Region/Application/OpenSimMain.cs
View File

@@ -172,8 +172,8 @@ namespace OpenSim
config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll");
config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
config.Set("storage_prim_inventories_experimental", false);
config.Set("startup_console_commands_file", "");
config.Set("shutdown_console_commands_file", "");
config.Set("startup_console_commands_file", String.Empty);
config.Set("shutdown_console_commands_file", String.Empty);
config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
config.Set("asset_database", "sqlite");
}
@@ -252,8 +252,8 @@ namespace OpenSim
m_storagePersistPrimInventories
= startupConfig.GetBoolean("storage_prim_inventories_experimental", false);
m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", "");
m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", "");
m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty);
m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty);
m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
@@ -374,7 +374,7 @@ namespace OpenSim
// }
//Run Startup Commands
if (m_startupCommandsFile != "")
if (m_startupCommandsFile != String.Empty)
{
RunCommandScript(m_startupCommandsFile);
}
@@ -421,7 +421,7 @@ namespace OpenSim
SQLAssetServer sqlAssetServer = new SQLAssetServer("OpenSim.Framework.Data.MSSQL.dll");
sqlAssetServer.LoadDefaultAssets();
assetServer = sqlAssetServer;
//assetServer = new GridAssetClient("");
//assetServer = new GridAssetClient(String.Empty);
}
else
{
@@ -585,7 +585,7 @@ namespace OpenSim
/// </summary>
public virtual void Shutdown()
{
if (m_startupCommandsFile != "")
if (m_startupCommandsFile != String.Empty)
{
RunCommandScript(m_shutdownCommandsFile);
}
@@ -622,10 +622,10 @@ namespace OpenSim
if (File.Exists(fileName))
{
StreamReader readFile = File.OpenText(fileName);
string currentCommand = "";
string currentCommand = String.Empty;
while ((currentCommand = readFile.ReadLine()) != null)
{
if (currentCommand != "")
if (currentCommand != String.Empty)
{
MainLog.Instance.Verbose("COMMANDFILE", "Running '" + currentCommand + "'");
MainLog.Instance.MainLogRunCommand(currentCommand);
@@ -645,7 +645,7 @@ namespace OpenSim
/// <param name="cmdparams">Additional arguments passed to the command</param>
public void RunCmd(string command, string[] cmdparams)
{
string result = "";
string result = String.Empty;
switch (command)
{
@@ -982,7 +982,7 @@ namespace OpenSim
private string CombineParams(string[] commandParams, int pos)
{
string result = "";
string result = String.Empty;
for (int i = pos; i < commandParams.Length; i++)
{
result += commandParams[i] + " ";

6
OpenSim/Region/ClientStack/ClientView.cs
View File

@@ -343,7 +343,7 @@ namespace OpenSim.Region.ClientStack
{
if (m_debug > 0)
{
string info = "";
string info = String.Empty;
if (m_debug < 255 && packet.Type == PacketType.AgentUpdate)
return;
if (m_debug < 254 && packet.Type == PacketType.ViewerEffect)
@@ -783,7 +783,7 @@ namespace OpenSim.Region.ClientStack
agentData.child = false;
agentData.firstname = m_firstName;
agentData.lastname = m_lastName;
agentData.CapsPath = "";
agentData.CapsPath = String.Empty;
return agentData;
}
@@ -2521,7 +2521,7 @@ namespace OpenSim.Region.ClientStack
case PacketType.ChatFromViewer:
ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;
string fromName = ""; //ClientAvatar.firstname + " " + ClientAvatar.lastname;
string fromName = String.Empty; //ClientAvatar.firstname + " " + ClientAvatar.lastname;
byte[] message = inchatpack.ChatData.Message;
byte type = inchatpack.ChatData.Type;
LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos;

4
OpenSim/Region/Communications/Local/LocalBackEndServices.cs
View File

@@ -45,7 +45,7 @@ namespace OpenSim.Region.Communications.Local
private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>();
public string _gdebugRegionName = "";
public string _gdebugRegionName = System.String.Empty;
public string gdebugRegionName
{
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Communications.Local
set { _gdebugRegionName = value; }
}
public string _rdebugRegionName = "";
public string _rdebugRegionName = System.String.Empty;
public string rdebugRegionName
{

2
OpenSim/Region/Communications/Local/LocalUserServices.cs
View File

@@ -55,7 +55,7 @@ namespace OpenSim.Region.Communications.Local
public override UserProfileData SetupMasterUser(string firstName, string lastName)
{
return SetupMasterUser(firstName, lastName, "");
return SetupMasterUser(firstName, lastName, String.Empty);
}
public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)

30
OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
View File

@@ -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.Region.Communications.Local")]
[assembly : AssemblyCopyright("Copyright © 2007")]
[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")]

4
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@@ -55,7 +55,7 @@ namespace OpenSim.Region.Communications.OGS1
public BaseHttpServer httpListener;
public NetworkServersInfo serversInfo;
public BaseHttpServer httpServer;
public string _gdebugRegionName = "";
public string _gdebugRegionName = String.Empty;
public string gdebugRegionName
{
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Communications.OGS1
set { _gdebugRegionName = value; }
}
public string _rdebugRegionName = "";
public string _rdebugRegionName = String.Empty;
public string rdebugRegionName
{

4
OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
View File

@@ -144,7 +144,7 @@ namespace OpenSim.Region.Communications.OGS1
{
Hashtable param = new Hashtable();
param["queryid"] = (string) queryID.ToString();
param["avquery"] = objAlphaNumericPattern.Replace(query, "");
param["avquery"] = objAlphaNumericPattern.Replace(query, String.Empty);
IList parameters = new ArrayList();
parameters.Add(param);
XmlRpcRequest req = new XmlRpcRequest("get_avatar_picker_avatar", parameters);
@@ -212,7 +212,7 @@ namespace OpenSim.Region.Communications.OGS1
public UserProfileData SetupMasterUser(string firstName, string lastName)
{
return SetupMasterUser(firstName, lastName, "");
return SetupMasterUser(firstName, lastName, String.Empty);
}
public UserProfileData SetupMasterUser(string firstName, string lastName, string password)

30
OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
View File

@@ -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("OpenGrid.Framework.Communications.OGS1")]
[assembly : AssemblyCopyright("Copyright © 2007")]
[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")]

2
OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
View File

@@ -87,7 +87,7 @@ namespace OpenSim.Region.Environment.Modules
string bornOn = "Before now";
string flAbout = "First life? What is one of those? OpenSim is my life!";
LLUUID partner = new LLUUID("11111111-1111-0000-0000-000100bba000");
remoteClient.SendAvatarProperties(avatarID, about, bornOn, "", flAbout, 0, LLUUID.Zero, LLUUID.Zero, "",
remoteClient.SendAvatarProperties(avatarID, about, bornOn, System.String.Empty, flAbout, 0, LLUUID.Zero, LLUUID.Zero, System.String.Empty,
partner);
}
}

2
OpenSim/Region/Environment/Modules/XMLRPCModule.cs
View File

@@ -331,7 +331,7 @@ namespace OpenSim.Region.Environment.Modules
m_ChannelKey = channelKey;
m_MessageID = LLUUID.Random();
m_processed = false;
m_resp = "";
m_resp = String.Empty;
}
public bool IsProcessed()

2
OpenSim/Region/Environment/Modules/XferModule.cs
View File

@@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Modules
public class XferDownLoad
{
public byte[] Data = new byte[0];
public string FileName = "";
public string FileName = String.Empty;
public ulong XferID = 0;
public int DataPointer = 0;
public uint Packet = 0;

2
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@@ -376,7 +376,7 @@ namespace OpenSim.Region.Environment.Scenes
InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
if (item != null)
{
if (newName != "")
if (newName != System.String.Empty)
{
item.inventoryName = newName;
}

10
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -389,7 +389,7 @@ namespace OpenSim.Region.Environment.Scenes
m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed);
MainLog.Instance.Error("REGION", "Restarting Region in " + (seconds/60) + " minutes");
m_restartTimer.Start();
SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), "", RegionInfo.RegionName + ": Restarting in 2 Minutes");
SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in 2 Minutes");
//SendGeneralAlert(RegionInfo.RegionName + ": Restarting in 2 Minutes");
}
}
@@ -404,7 +404,7 @@ namespace OpenSim.Region.Environment.Scenes
if (m_RestartTimerCounter <= m_incrementsof15seconds)
{
if (m_RestartTimerCounter == 4 || m_RestartTimerCounter == 6 || m_RestartTimerCounter == 7)
SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), "", RegionInfo.RegionName + ": Restarting in " +
SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in " +
((8 - m_RestartTimerCounter) * 15) + " seconds");
// SendGeneralAlert(RegionInfo.RegionName + ": Restarting in " + ((8 - m_RestartTimerCounter)*15) +
@@ -1408,7 +1408,7 @@ namespace OpenSim.Region.Environment.Scenes
{
if (regionHandle == m_regInfo.RegionHandle)
{
if (agent.CapsPath != "")
if (agent.CapsPath != String.Empty)
{
Caps cap =
new Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port,
@@ -2004,7 +2004,7 @@ namespace OpenSim.Region.Environment.Scenes
private string CombineParams(string[] commandParams, int pos)
{
string result = "";
string result = String.Empty;
for (int i = pos; i < commandParams.Length; i++)
{
result += commandParams[i] + " ";
@@ -2253,7 +2253,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary>
/// <param name="avatarID">AvatarID to lookup</param>
/// <returns></returns>
public bool PresenceChildStatus(LLUUID avatarID)
public override bool PresenceChildStatus(LLUUID avatarID)
{
ScenePresence cp = GetScenePresence(avatarID);
return cp.IsChildAgent;

2
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@@ -54,7 +54,7 @@ namespace OpenSim.Region.Environment.Scenes
public KillObjectDelegate KillObject;
public string _debugRegionName = "";
public string _debugRegionName = String.Empty;
public string debugRegionName
{

4
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@@ -1114,7 +1114,7 @@ namespace OpenSim.Region.Environment.Scenes
{
return part.Name;
}
return "";
return String.Empty;
}
public string GetPartDescription(uint localID)
@@ -1124,7 +1124,7 @@ namespace OpenSim.Region.Environment.Scenes
{
return part.Description;
}
return "";
return String.Empty;
}
/// <summary>

4
OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
View File

@@ -41,7 +41,7 @@ namespace OpenSim.Region.Environment.Scenes
{
public partial class SceneObjectPart : IScriptHost
{
private string m_inventoryFileName = "";
private string m_inventoryFileName = String.Empty;
/// <summary>
/// The inventory folder for this prim
@@ -334,7 +334,7 @@ namespace OpenSim.Region.Environment.Scenes
public class InventoryStringBuilder
{
public string BuildString = "";
public string BuildString = String.Empty;
public InventoryStringBuilder(LLUUID folderID, LLUUID parentID)
{

8
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@@ -395,7 +395,7 @@ namespace OpenSim.Region.Environment.Scenes
set { m_acceleration = value; }
}
private string m_description = "";
private string m_description = String.Empty;
public string Description
{
@@ -418,7 +418,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
private string m_text = "";
private string m_text = String.Empty;
public Vector3 SitTargetPosition
{
@@ -440,7 +440,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
private string m_sitName = "";
private string m_sitName = String.Empty;
public string SitName
{
@@ -448,7 +448,7 @@ namespace OpenSim.Region.Environment.Scenes
set { m_sitName = value; }
}
private string m_touchName = "";
private string m_touchName = String.Empty;
public string TouchName
{

6
OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
View File

@@ -44,19 +44,19 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
public string SitName
{
get { return ""; }
get { return String.Empty; }
set { }
}
public string TouchName
{
get { return ""; }
get { return String.Empty; }
set { }
}
public string Description
{
get { return ""; }
get { return String.Empty; }
set { }
}

6
OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
View File

@@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
//}
//catch (Exception e)
//{
// m_log.Error("ScriptEngine", "Error loading assembly \"" + FileName + "\": " + e.ToString());
// m_log.Error("ScriptEngine", "Error loading assembly \String.Empty + FileName + "\": " + e.ToString());
//}
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
//}
//catch (Exception e)
//{
// m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
// m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString());
//}
ScriptEngineInterface ret;
@@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
//}
//catch (Exception e)
//{
// m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
// m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString());
//}
return ret;

2
OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
View File

@@ -262,7 +262,7 @@ namespace OpenSim.Region.Environment.Types
public string[] GetNeighbours(string nodeName)
{
string[] retVal = new string[1];
retVal[0] = "";
retVal[0] = System.String.Empty;
return retVal;
}
}

2
OpenSim/Region/Examples/SimpleApp/Program.cs
View File

@@ -88,7 +88,7 @@ namespace SimpleApp
m_commsManager = localComms;
LocalLoginService loginService =
new LocalLoginService(userService, "", localComms, m_networkServersInfo, false);
new LocalLoginService(userService, String.Empty, localComms, m_networkServersInfo, false);
loginService.OnLoginToRegion += backendService.AddNewSession;
m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);

32
OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
View File

@@ -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;
@@ -8,9 +36,9 @@ using System.Runtime.InteropServices;
[assembly : AssemblyTitle("SimpleApp")]
[assembly : AssemblyDescription("")]
[assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("Playahead AB")]
[assembly : AssemblyCompany("OpenSimulator.org")]
[assembly : AssemblyProduct("SimpleApp")]
[assembly : AssemblyCopyright("Copyright © Playahead AB 2007")]
[assembly : AssemblyCopyright("Copyright © OpenSimulator Developers 2007-2008")]
[assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")]

6
OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
View File

@@ -50,7 +50,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
{
/*if (args[0].ToLower() == "lslexport")
{
string sequence = "";
string sequence = String.Empty;
foreach (KeyValuePair<LLUUID, SceneObject> obj in script.world.Objects)
{
@@ -82,13 +82,13 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
LLVector3 scale = prim.Scale;
LLVector3 rootPos = prim.WorldPos;
string setPrimParams = "";
string setPrimParams = String.Empty;
setPrimParams += "[PRIM_SCALE, " + scale.ToString() + ", PRIM_POS, " + rootPos.ToString() + ", PRIM_ROTATION, " + rot.ToString() + "]\n";
return setPrimParams;
*/
return "";
return System.String.Empty;
}
}
}

14
OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs
View File

@@ -237,7 +237,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
public class PoolUtf8 : PoolItem
{
public string Value = "";
public string Value = String.Empty;
public void readValue(byte[] data, ref int pointer, int length)
{
@@ -274,7 +274,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
public class PoolClass : PoolItem
{
//public string name = "";
//public string name = String.Empty;
public ushort namePointer = 0;
private ClassRecord parent;
public PoolUtf8 Name;
@@ -384,7 +384,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
{
public ushort AccessFlags = 0;
public ushort NameIndex = 0;
public string Name = "";
public string Name = String.Empty;
public ushort DescriptorIndex = 0;
public ushort AttributeCount = 0;
public List<MethodAttribute> Attributes = new List<MethodAttribute>();
@@ -436,7 +436,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
public class MethodAttribute
{
public ushort NameIndex = 0;
public string Name = "";
public string Name = String.Empty;
public Int32 Length = 0;
//for now only support code attribute
public ushort MaxStack = 0;
@@ -502,7 +502,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
public class SubAttribute
{
public ushort NameIndex = 0;
public string Name = "";
public string Name = String.Empty;
public Int32 Length = 0;
public byte[] Data;
private ClassRecord parent;
@@ -546,7 +546,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
{
public ushort AccessFlags = 0;
public ushort NameIndex = 0;
public string Name = "";
public string Name = String.Empty;
public ushort DescriptorIndex = 0;
public ushort AttributeCount = 0;
public List<FieldAttribute> Attributes = new List<FieldAttribute>();
@@ -605,7 +605,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
public class FieldAttribute
{
public ushort NameIndex = 0;
public string Name = "";
public string Name = String.Empty;
public Int32 Length = 0;
public byte[] Data;
private ClassRecord parent;

4
OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
View File

@@ -46,8 +46,8 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
string typ =
((ClassRecord.PoolMethodRef) m_thread.currentClass.m_constantsPool[refIndex - 1]).
mNameType.Type.Value;
string typeparam = "";
string typereturn = "";
string typeparam = System.String.Empty;
string typereturn = System.String.Empty;
int firstbrak = 0;
int secondbrak = 0;
firstbrak = typ.LastIndexOf('(');

2
OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
View File

@@ -976,7 +976,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin
public class BulletXCharacter : BulletXActor
{
public BulletXCharacter(BulletXScene parent_scene, PhysicsVector pos)
: this("", parent_scene, pos)
: this(String.Empty, parent_scene, pos)
{
}

2
OpenSim/Region/Physics/Meshing/SimpleHull.cs
View File

@@ -53,7 +53,7 @@ namespace OpenSim.Region.Physics.Meshing
public override String ToString()
{
String result = "";
String result = String.Empty;
foreach (Vertex v in vertices)
{
result += "b:" + v.ToString() + "\n";

2
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@@ -83,7 +83,7 @@ namespace OpenSim.Region.Physics.OdePlugin
private bool m_alwaysRun = false;
private bool m_hackSentFall = false;
private bool m_hackSentFly = false;
private string m_name = "";
private string m_name = String.Empty;
private bool[] m_colliderarr = new bool[11];
private bool[] m_colliderGroundarr = new bool[11];

4
OpenSim/Region/ScriptEngine/Common/Executor.cs
View File

@@ -88,7 +88,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//type.InvokeMember(EventName, BindingFlags.InvokeMethod, null, m_Script, args);
//Console.WriteLine("ScriptEngine Executor.ExecuteEvent: \"" + EventName + "\"");
//Console.WriteLine("ScriptEngine Executor.ExecuteEvent: \String.Empty + EventName + "\String.Empty);
if (Events.ContainsKey(EventName) == false)
{
@@ -112,7 +112,7 @@ namespace OpenSim.Region.ScriptEngine.Common
if (ev == null) // No event by that name!
{
//Console.WriteLine("ScriptEngine Can not find any event named: \"" + EventName + "\"");
//Console.WriteLine("ScriptEngine Can not find any event named: \String.Empty + EventName + "\String.Empty);
return;
}

2
OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs
View File

@@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public LSL_BuiltIn_Commands_Interface m_LSL_Functions;
private string _Source = "";
private string _Source = String.Empty;
public string Source
{
get

58
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@@ -297,7 +297,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public int llListen(int channelID, string name, string ID, string msg)
{
if (ID == "")
if (ID == String.Empty)
{
ID = LLUUID.Zero.ToString();
}
@@ -338,19 +338,19 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llDetectedName(int number)
{
NotImplemented("llDetectedName");
return "";
return String.Empty;
}
public string llDetectedKey(int number)
{
NotImplemented("llDetectedKey");
return "";
return String.Empty;
}
public string llDetectedOwner(int number)
{
NotImplemented("llDetectedOwner");
return "";
return String.Empty;
}
public int llDetectedType(int number)
@@ -693,7 +693,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return texface.TextureID.ToString();
}
NotImplemented("llGetTexture");
return "";
return String.Empty;
}
public void llSetPos(LSL_Types.Vector3 pos)
@@ -1175,7 +1175,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llGetPermissionsKey()
{
NotImplemented("llGetPermissionsKey");
return "";
return String.Empty;
}
public int llGetPermissions()
@@ -1336,7 +1336,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llGetInventoryName(int type, int number)
{
NotImplemented("llGetInventoryName");
return "";
return String.Empty;
}
public void llSetScriptState(string name, int run)
@@ -1378,13 +1378,13 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llRequestAgentData(string id, int data)
{
NotImplemented("llRequestAgentData");
return "";
return String.Empty;
}
public string llRequestInventoryData(string name)
{
NotImplemented("llRequestInventoryData");
return "";
return String.Empty;
}
public void llSetDamage(double damage)
@@ -1473,7 +1473,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llGetAnimation(string id)
{
NotImplemented("llGetAnimation");
return "";
return String.Empty;
}
public void llResetScript()
@@ -1495,7 +1495,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llGetScriptName()
{
return "";
return String.Empty;
}
public int llGetNumberOfSides()
@@ -1534,7 +1534,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llGetInventoryKey(string name)
{
return "";
return String.Empty;
}
public void llAllowInventoryDrop(int add)
@@ -1592,7 +1592,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llGetOwnerKey(string id)
{
NotImplemented("llGetOwnerKey");
return "";
return String.Empty;
}
public LSL_Types.Vector3 llGetCenterOfMass()
@@ -1610,14 +1610,14 @@ namespace OpenSim.Region.ScriptEngine.Common
// s = 1;
//int c = 0;
//LSL_Types.list chunk = new LSL_Types.list();
//string chunkString = "";
//string chunkString = String.Empty;
//foreach (string element in src)
//{
// c++;
// if (c > s)
// {
// sorted.Add(chunkString, chunk);
// chunkString = "";
// chunkString = String.Empty;
// chunk = new LSL_Types.list();
// c = 0;
// }
@@ -1693,7 +1693,7 @@ namespace OpenSim.Region.ScriptEngine.Common
}
if (index >= src.Length)
{
return "";
return String.Empty;
}
return src.Data[index].ToString();
}
@@ -1814,7 +1814,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llList2CSV(LSL_Types.list src)
{
string ret = "";
string ret = String.Empty;
foreach (object o in src.Data)
{
ret = ret + o.ToString() + ",";
@@ -1968,7 +1968,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llKey2Name(string id)
{
NotImplemented("llKey2Name");
return "";
return String.Empty;
}
public void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate)
@@ -2006,7 +2006,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llGetNotecardLine(string name, int line)
{
NotImplemented("llGetNotecardLine");
return "";
return String.Empty;
}
public LSL_Types.Vector3 llGetAgentSize(string id)
@@ -2257,7 +2257,7 @@ namespace OpenSim.Region.ScriptEngine.Common
if (AVID != LLUUID.Zero)
return AVID.ToString();
else
return "";
return String.Empty;
}
public void llAddToLandPassList(string avatar, double hours)
@@ -2289,9 +2289,9 @@ namespace OpenSim.Region.ScriptEngine.Common
{
if (src.Length == 0)
{
return "";
return String.Empty;
}
string ret = "";
string ret = String.Empty;
foreach (object o in src.Data)
{
ret = ret + o.ToString() + seperator;
@@ -2352,7 +2352,7 @@ namespace OpenSim.Region.ScriptEngine.Common
if (xmlrpcMod.IsEnabled())
{
LLUUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID);
object[] resobj = new object[] { 1, channelID.ToString(), LLUUID.Zero.ToString(), "", 0, "" };
object[] resobj = new object[] { 1, channelID.ToString(), LLUUID.Zero.ToString(), String.Empty, 0, String.Empty };
m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(m_localID, m_itemID, "remote_data", resobj);
}
}
@@ -2360,7 +2360,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llSendRemoteData(string channel, string dest, int idata, string sdata)
{
NotImplemented("llSendRemoteData");
return "";
return String.Empty;
}
public void llRemoteDataReply(string channel, string message_id, string sdata, int idata)
@@ -2578,7 +2578,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llGetNumberOfNotecardLines(string name)
{
NotImplemented("llGetNumberOfNotecardLines");
return "";
return String.Empty;
}
public LSL_Types.list llGetBoundingBox(string obj)
@@ -2600,7 +2600,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llIntegerToBase64(int number)
{
NotImplemented("llIntegerToBase64");
return "";
return String.Empty;
}
public int llBase64ToInteger(string str)
@@ -2660,7 +2660,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llGetInventoryCreator(string item)
{
NotImplemented("llGetInventoryCreator");
return "";
return String.Empty;
}
public void llOwnerSay(string msg)
@@ -2828,7 +2828,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llXorBase64StringsCorrect(string str1, string str2)
{
string ret = "";
string ret = String.Empty;
string src1 = llBase64ToString(str1);
string src2 = llBase64ToString(str2);
int c = 0;
@@ -3002,7 +3002,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams,
int timer)
{
if (dynamicID == "")
if (dynamicID == String.Empty)
{
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
LLUUID createdTexture =

4
OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
View File

@@ -429,10 +429,10 @@ namespace OpenSim.Region.ScriptEngine.Common
public override string ToString()
{
string output;
output = "";
output = String.Empty;
if (m_data.Length == 0)
{
return "";
return String.Empty;
}
foreach (object o in m_data)
{

30
OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs
View File

@@ -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.Region.ScriptEngine.Common")]
[assembly : AssemblyCopyright("Copyright © 2007")]
[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")]

2
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
View File

@@ -148,7 +148,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
// Handled by long commands
public void timer(uint localID, LLUUID itemID)
{
//myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "");
//myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, String.Empty);
}
public void listen(uint localID, LLUUID itemID)

2
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
View File

@@ -323,7 +323,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
// Do we have any scripts in this object at all? If not, return
if (m_ScriptEngine.m_ScriptManager.Scripts.ContainsKey(localID) == false)
{
//Console.WriteLine("Event \"" + FunctionName + "\" for localID: " + localID + ". No scripts found on this localID.");
//Console.WriteLine("Event \String.Empty + FunctionName + "\" for localID: " + localID + ". No scripts found on this localID.");
return;
}

2
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs
View File

@@ -259,7 +259,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
//Deliver data to prim's remote_data handler
object[] resobj = new object[]
{
2, rInfo.GetChannelKey().ToString(), rInfo.GetMessageID().ToString(), "",
2, rInfo.GetChannelKey().ToString(), rInfo.GetMessageID().ToString(), String.Empty,
rInfo.GetIntValue(),
rInfo.GetStrVal()
};

2
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
View File

@@ -161,7 +161,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
catch (ThreadAbortException tae)
{
string a = tae.ToString();
a = "";
a = String.Empty;
// Expected
}
}

2
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
View File

@@ -143,7 +143,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
// TODO: Return errors to user somehow
if (results.Errors.Count > 0)
{
string errtext = "";
string errtext = String.Empty;
foreach (CompilerError CompErr in results.Errors)
{
errtext += "Line number " + (CompErr.Line - 1) +

37
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
View File

@@ -28,6 +28,7 @@
using System.Collections.Generic;
using System.Text.RegularExpressions;
using System;
namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
{
@@ -58,7 +59,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
public string Convert(string Script)
{
quotes.Clear();
string Return = "";
string Return = System.String.Empty;
Script = " \r\n" + Script;
//
@@ -72,13 +73,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
// QUOTE REPLACEMENT
// temporarily replace quotes so we can work our magic on the script without
// always considering if we are inside our outside ""'s
string _Script = "";
// always considering if we are inside our outside String.Empty's
string _Script = System.String.Empty;
string C;
bool in_quote = false;
bool quote_replaced = false;
string quote_replacement_string = "Q_U_O_T_E_REPLACEMENT_";
string quote = "";
string quote = System.String.Empty;
bool last_was_escape = false;
int quote_replaced_count = 0;
for (int p = 0; p < Script.Length; p++)
@@ -97,7 +98,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
}
else
{
if (quote == "")
if (quote == System.String.Empty)
{
// We didn't replace quote, probably because of empty string?
_Script += quote_replacement_string +
@@ -107,7 +108,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
quotes.Add(
quote_replacement_string +
quote_replaced_count.ToString().PadLeft(5, "0".ToCharArray()[0]), quote);
quote = "";
quote = System.String.Empty;
}
break;
}
@@ -151,10 +152,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
//
int ilevel = 0;
int lastlevel = 0;
string ret = "";
string cache = "";
string ret = System.String.Empty;
string cache = System.String.Empty;
bool in_state = false;
string current_statename = "";
string current_statename = System.String.Empty;
for (int p = 0; p < Script.Length; p++)
{
C = Script.Substring(p, 1);
@@ -191,7 +192,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
}
ret += cache;
cache = "";
cache = String.Empty;
}
if (ilevel == 0 && lastlevel == 1)
{
@@ -199,7 +200,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
if (in_state == true)
{
cache = cache.Remove(cache.Length - 1, 1);
//cache = Regex.Replace(cache, "}$", "", RegexOptions.Multiline | RegexOptions.Singleline);
//cache = Regex.Replace(cache, "}$", String.Empty, RegexOptions.Multiline | RegexOptions.Singleline);
//Replace function names
// void dataserver(key query_id, string data) {
@@ -213,9 +214,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
}
ret += cache;
cache = "";
cache = String.Empty;
in_state = true;
current_statename = "";
current_statename = String.Empty;
}
break;
@@ -223,10 +224,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
lastlevel = ilevel;
}
ret += cache;
cache = "";
cache = String.Empty;
Script = ret;
ret = "";
ret = String.Empty;
foreach (string key in dataTypes.Keys)
@@ -287,7 +288,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
// Add namespace, class name and inheritance
Return = "" +
Return = String.Empty +
"using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic;";
//"using System; " +
//"using System.Collections.Generic; " +
@@ -309,9 +310,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
//}
Return += "" +
Return += String.Empty +
"namespace SecondLife { ";
Return += "" +
Return += String.Empty +
//"[Serializable] " +
"public class Script : OpenSim.Region.ScriptEngine.Common.LSL_BaseClass { ";
Return += @"public Script() { } ";

30
OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs
View File

@@ -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.Region.ScriptEngine.DotNetEngine")]
[assembly : AssemblyCopyright("Copyright © 2007")]
[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")]

2
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
View File

@@ -64,7 +64,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
// We will initialize and start the script.
// It will be up to the script itself to hook up the correct events.
string ScriptSource = "";
string ScriptSource = String.Empty;
SceneObjectPart m_host = World.GetSceneObjectPart(localID);

6
OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs
View File

@@ -63,7 +63,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
LSOEngine.LSO.Common.SendToLog("Assembly name: " + asmName.Name);
LSOEngine.LSO.Common.SendToLog("Assembly File Name: " + asmName.Name + ".dll");
LSOEngine.LSO.Common.SendToLog("Starting processing of LSL ByteCode...");
LSOEngine.LSO.Common.SendToLog("");
LSOEngine.LSO.Common.SendToLog(String.Empty);
// Create Assembly
@@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
(asmName.Name,
DLL_FileName);
//Common.SendToDebug("asmName.Name is still \"" + asmName.Name + "\"");
//Common.SendToDebug("asmName.Name is still \String.Empty + asmName.Name + "\String.Empty);
// Create a Class (/Type)
TypeBuilder typeBuilder = modBuilder.DefineType(
"LSL_ScriptObject",
@@ -152,7 +152,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
//foreach (string s in ret)
//{
// Common.SendToLog("");
// Common.SendToLog(String.Empty);
// Common.SendToLog("*** Executing LSL Server Event: " + s);
// //object test = type.GetMember(s);
// //object runner = type.InvokeMember(s, BindingFlags.Public | BindingFlags.InvokeMethod | BindingFlags.Instance, null, MyScript, args);

2
OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
View File

@@ -430,7 +430,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
private string Read_String()
{
string ret = "";
string ret = String.Empty;
byte reader = br_read(1)[0];
while (reader != 0x000)
{

30
OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs
View File

@@ -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.Region.ScriptEngine.LSOEngine")]
[assembly : AssemblyCopyright("Copyright © 2007")]
[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")]

2
OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
View File

@@ -61,7 +61,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
// We will initialize and start the script.
// It will be up to the script itself to hook up the correct events.
string ScriptSource = "";
string ScriptSource = String.Empty;
SceneObjectPart m_host = World.GetSceneObjectPart(localID);

30
OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs
View File

@@ -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.Region.ScriptEngine.RemoteServer")]
[assembly : AssemblyCopyright("Copyright © 2007")]
[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")]

4
OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
View File

@@ -798,7 +798,7 @@ namespace OpenSim.DataStore.MSSQL
private SqlCommand createUpdateCommand(string table, string pk, DataTable dt)
{
string sql = "update " + table + " set ";
string subsql = "";
string subsql = String.Empty;
foreach (DataColumn col in dt.Columns)
{
if (subsql.Length > 0)
@@ -825,7 +825,7 @@ namespace OpenSim.DataStore.MSSQL
private string defineTable(DataTable dt)
{
string sql = "create table " + dt.TableName + "(";
string subsql = "";
string subsql = String.Empty;
foreach (DataColumn col in dt.Columns)
{
if (subsql.Length > 0)

30
OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs
View File

@@ -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.DataStore.NullStorage")]
[assembly : AssemblyCopyright("Copyright © 2007")]
[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")]

2
OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
View File

@@ -37,7 +37,7 @@ using System.Runtime.InteropServices;
[assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("")]
[assembly : AssemblyProduct("OpenSim.Region.Terrain.BasicTerrain")]
[assembly : AssemblyCopyright("Copyright © 2007")]
[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
[assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")]