aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/Application.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs22
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs6
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs4
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs2
-rw-r--r--OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/XMLRPCModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/XferModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs6
-rw-r--r--OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs32
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs6
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs14
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs4
-rw-r--r--OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs2
-rw-r--r--OpenSim/Region/Physics/Meshing/SimpleHull.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/Executor.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs58
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_Types.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs37
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs4
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs2
50 files changed, 364 insertions, 139 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index ca1e9c9..d253775 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -45,7 +45,7 @@ namespace OpenSim
45 45
46 46
47 Console.Write("Performing compatibility checks... "); 47 Console.Write("Performing compatibility checks... ");
48 string supported = ""; 48 string supported = String.Empty;
49 if (Util.IsEnvironmentSupported(ref supported)) 49 if (Util.IsEnvironmentSupported(ref supported))
50 { 50 {
51 Console.WriteLine(" Environment is compatible.\n"); 51 Console.WriteLine(" Environment is compatible.\n");
@@ -90,7 +90,7 @@ namespace OpenSim
90 // TODO: Add config option to allow users to turn off error reporting 90 // TODO: Add config option to allow users to turn off error reporting
91 // TODO: Post error report (disabled for now) 91 // TODO: Post error report (disabled for now)
92 92
93 string msg = ""; 93 string msg = String.Empty;
94 msg += "\r\n"; 94 msg += "\r\n";
95 msg += "APPLICATION EXCEPTION DETECTED: " + e.ToString() + "\r\n"; 95 msg += "APPLICATION EXCEPTION DETECTED: " + e.ToString() + "\r\n";
96 msg += "\r\n"; 96 msg += "\r\n";
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7249322..7d83df7 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -172,8 +172,8 @@ namespace OpenSim
172 config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll"); 172 config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll");
173 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); 173 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
174 config.Set("storage_prim_inventories_experimental", false); 174 config.Set("storage_prim_inventories_experimental", false);
175 config.Set("startup_console_commands_file", ""); 175 config.Set("startup_console_commands_file", String.Empty);
176 config.Set("shutdown_console_commands_file", ""); 176 config.Set("shutdown_console_commands_file", String.Empty);
177 config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); 177 config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
178 config.Set("asset_database", "sqlite"); 178 config.Set("asset_database", "sqlite");
179 } 179 }
@@ -252,8 +252,8 @@ namespace OpenSim
252 m_storagePersistPrimInventories 252 m_storagePersistPrimInventories
253 = startupConfig.GetBoolean("storage_prim_inventories_experimental", false); 253 = startupConfig.GetBoolean("storage_prim_inventories_experimental", false);
254 254
255 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", ""); 255 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty);
256 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", ""); 256 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty);
257 257
258 m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); 258 m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
259 259
@@ -374,7 +374,7 @@ namespace OpenSim
374 // } 374 // }
375 375
376 //Run Startup Commands 376 //Run Startup Commands
377 if (m_startupCommandsFile != "") 377 if (m_startupCommandsFile != String.Empty)
378 { 378 {
379 RunCommandScript(m_startupCommandsFile); 379 RunCommandScript(m_startupCommandsFile);
380 } 380 }
@@ -421,7 +421,7 @@ namespace OpenSim
421 SQLAssetServer sqlAssetServer = new SQLAssetServer("OpenSim.Framework.Data.MSSQL.dll"); 421 SQLAssetServer sqlAssetServer = new SQLAssetServer("OpenSim.Framework.Data.MSSQL.dll");
422 sqlAssetServer.LoadDefaultAssets(); 422 sqlAssetServer.LoadDefaultAssets();
423 assetServer = sqlAssetServer; 423 assetServer = sqlAssetServer;
424 //assetServer = new GridAssetClient(""); 424 //assetServer = new GridAssetClient(String.Empty);
425 } 425 }
426 else 426 else
427 { 427 {
@@ -585,7 +585,7 @@ namespace OpenSim
585 /// </summary> 585 /// </summary>
586 public virtual void Shutdown() 586 public virtual void Shutdown()
587 { 587 {
588 if (m_startupCommandsFile != "") 588 if (m_startupCommandsFile != String.Empty)
589 { 589 {
590 RunCommandScript(m_shutdownCommandsFile); 590 RunCommandScript(m_shutdownCommandsFile);
591 } 591 }
@@ -622,10 +622,10 @@ namespace OpenSim
622 if (File.Exists(fileName)) 622 if (File.Exists(fileName))
623 { 623 {
624 StreamReader readFile = File.OpenText(fileName); 624 StreamReader readFile = File.OpenText(fileName);
625 string currentCommand = ""; 625 string currentCommand = String.Empty;
626 while ((currentCommand = readFile.ReadLine()) != null) 626 while ((currentCommand = readFile.ReadLine()) != null)
627 { 627 {
628 if (currentCommand != "") 628 if (currentCommand != String.Empty)
629 { 629 {
630 MainLog.Instance.Verbose("COMMANDFILE", "Running '" + currentCommand + "'"); 630 MainLog.Instance.Verbose("COMMANDFILE", "Running '" + currentCommand + "'");
631 MainLog.Instance.MainLogRunCommand(currentCommand); 631 MainLog.Instance.MainLogRunCommand(currentCommand);
@@ -645,7 +645,7 @@ namespace OpenSim
645 /// <param name="cmdparams">Additional arguments passed to the command</param> 645 /// <param name="cmdparams">Additional arguments passed to the command</param>
646 public void RunCmd(string command, string[] cmdparams) 646 public void RunCmd(string command, string[] cmdparams)
647 { 647 {
648 string result = ""; 648 string result = String.Empty;
649 649
650 switch (command) 650 switch (command)
651 { 651 {
@@ -982,7 +982,7 @@ namespace OpenSim
982 982
983 private string CombineParams(string[] commandParams, int pos) 983 private string CombineParams(string[] commandParams, int pos)
984 { 984 {
985 string result = ""; 985 string result = String.Empty;
986 for (int i = pos; i < commandParams.Length; i++) 986 for (int i = pos; i < commandParams.Length; i++)
987 { 987 {
988 result += commandParams[i] + " "; 988 result += commandParams[i] + " ";
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index c937fab..d3a8254 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -343,7 +343,7 @@ namespace OpenSim.Region.ClientStack
343 { 343 {
344 if (m_debug > 0) 344 if (m_debug > 0)
345 { 345 {
346 string info = ""; 346 string info = String.Empty;
347 if (m_debug < 255 && packet.Type == PacketType.AgentUpdate) 347 if (m_debug < 255 && packet.Type == PacketType.AgentUpdate)
348 return; 348 return;
349 if (m_debug < 254 && packet.Type == PacketType.ViewerEffect) 349 if (m_debug < 254 && packet.Type == PacketType.ViewerEffect)
@@ -783,7 +783,7 @@ namespace OpenSim.Region.ClientStack
783 agentData.child = false; 783 agentData.child = false;
784 agentData.firstname = m_firstName; 784 agentData.firstname = m_firstName;
785 agentData.lastname = m_lastName; 785 agentData.lastname = m_lastName;
786 agentData.CapsPath = ""; 786 agentData.CapsPath = String.Empty;
787 return agentData; 787 return agentData;
788 } 788 }
789 789
@@ -2521,7 +2521,7 @@ namespace OpenSim.Region.ClientStack
2521 case PacketType.ChatFromViewer: 2521 case PacketType.ChatFromViewer:
2522 ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; 2522 ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;
2523 2523
2524 string fromName = ""; //ClientAvatar.firstname + " " + ClientAvatar.lastname; 2524 string fromName = String.Empty; //ClientAvatar.firstname + " " + ClientAvatar.lastname;
2525 byte[] message = inchatpack.ChatData.Message; 2525 byte[] message = inchatpack.ChatData.Message;
2526 byte type = inchatpack.ChatData.Type; 2526 byte type = inchatpack.ChatData.Type;
2527 LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos; 2527 LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos;
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 4dec884..8cba6fd 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Communications.Local
45 45
46 private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>(); 46 private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>();
47 47
48 public string _gdebugRegionName = ""; 48 public string _gdebugRegionName = System.String.Empty;
49 49
50 public string gdebugRegionName 50 public string gdebugRegionName
51 { 51 {
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Communications.Local
53 set { _gdebugRegionName = value; } 53 set { _gdebugRegionName = value; }
54 } 54 }
55 55
56 public string _rdebugRegionName = ""; 56 public string _rdebugRegionName = System.String.Empty;
57 57
58 public string rdebugRegionName 58 public string rdebugRegionName
59 { 59 {
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 6269565..e02a600 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Communications.Local
55 55
56 public override UserProfileData SetupMasterUser(string firstName, string lastName) 56 public override UserProfileData SetupMasterUser(string firstName, string lastName)
57 { 57 {
58 return SetupMasterUser(firstName, lastName, ""); 58 return SetupMasterUser(firstName, lastName, String.Empty);
59 } 59 }
60 60
61 public override UserProfileData SetupMasterUser(string firstName, string lastName, string password) 61 public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)
diff --git a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
index 481577e..1f73d1a 100644
--- a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/Local/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
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using 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.Region.Communications.Local")] 40[assembly : AssemblyProduct("OpenSim.Region.Communications.Local")]
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/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index e1d29bc..e3d10b5 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Communications.OGS1
55 public BaseHttpServer httpListener; 55 public BaseHttpServer httpListener;
56 public NetworkServersInfo serversInfo; 56 public NetworkServersInfo serversInfo;
57 public BaseHttpServer httpServer; 57 public BaseHttpServer httpServer;
58 public string _gdebugRegionName = ""; 58 public string _gdebugRegionName = String.Empty;
59 59
60 public string gdebugRegionName 60 public string gdebugRegionName
61 { 61 {
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Communications.OGS1
63 set { _gdebugRegionName = value; } 63 set { _gdebugRegionName = value; }
64 } 64 }
65 65
66 public string _rdebugRegionName = ""; 66 public string _rdebugRegionName = String.Empty;
67 67
68 public string rdebugRegionName 68 public string rdebugRegionName
69 { 69 {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index e645074..36ab4bb 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Communications.OGS1
144 { 144 {
145 Hashtable param = new Hashtable(); 145 Hashtable param = new Hashtable();
146 param["queryid"] = (string) queryID.ToString(); 146 param["queryid"] = (string) queryID.ToString();
147 param["avquery"] = objAlphaNumericPattern.Replace(query, ""); 147 param["avquery"] = objAlphaNumericPattern.Replace(query, String.Empty);
148 IList parameters = new ArrayList(); 148 IList parameters = new ArrayList();
149 parameters.Add(param); 149 parameters.Add(param);
150 XmlRpcRequest req = new XmlRpcRequest("get_avatar_picker_avatar", parameters); 150 XmlRpcRequest req = new XmlRpcRequest("get_avatar_picker_avatar", parameters);
@@ -212,7 +212,7 @@ namespace OpenSim.Region.Communications.OGS1
212 212
213 public UserProfileData SetupMasterUser(string firstName, string lastName) 213 public UserProfileData SetupMasterUser(string firstName, string lastName)
214 { 214 {
215 return SetupMasterUser(firstName, lastName, ""); 215 return SetupMasterUser(firstName, lastName, String.Empty);
216 } 216 }
217 217
218 public UserProfileData SetupMasterUser(string firstName, string lastName, string password) 218 public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
diff --git a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
index 631cfd0..2aa5739 100644
--- a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/OGS1/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
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using 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("OpenGrid.Framework.Communications.OGS1")] 40[assembly : AssemblyProduct("OpenGrid.Framework.Communications.OGS1")]
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/Region/Environment/Modules/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
index 1b7e2a4..66c9fd5 100644
--- a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Environment.Modules
87 string bornOn = "Before now"; 87 string bornOn = "Before now";
88 string flAbout = "First life? What is one of those? OpenSim is my life!"; 88 string flAbout = "First life? What is one of those? OpenSim is my life!";
89 LLUUID partner = new LLUUID("11111111-1111-0000-0000-000100bba000"); 89 LLUUID partner = new LLUUID("11111111-1111-0000-0000-000100bba000");
90 remoteClient.SendAvatarProperties(avatarID, about, bornOn, "", flAbout, 0, LLUUID.Zero, LLUUID.Zero, "", 90 remoteClient.SendAvatarProperties(avatarID, about, bornOn, System.String.Empty, flAbout, 0, LLUUID.Zero, LLUUID.Zero, System.String.Empty,
91 partner); 91 partner);
92 } 92 }
93 } 93 }
diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
index 481ba3f..76c6a53 100644
--- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
@@ -331,7 +331,7 @@ namespace OpenSim.Region.Environment.Modules
331 m_ChannelKey = channelKey; 331 m_ChannelKey = channelKey;
332 m_MessageID = LLUUID.Random(); 332 m_MessageID = LLUUID.Random();
333 m_processed = false; 333 m_processed = false;
334 m_resp = ""; 334 m_resp = String.Empty;
335 } 335 }
336 336
337 public bool IsProcessed() 337 public bool IsProcessed()
diff --git a/OpenSim/Region/Environment/Modules/XferModule.cs b/OpenSim/Region/Environment/Modules/XferModule.cs
index 807b46c..f8da9af 100644
--- a/OpenSim/Region/Environment/Modules/XferModule.cs
+++ b/OpenSim/Region/Environment/Modules/XferModule.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Modules
131 public class XferDownLoad 131 public class XferDownLoad
132 { 132 {
133 public byte[] Data = new byte[0]; 133 public byte[] Data = new byte[0];
134 public string FileName = ""; 134 public string FileName = String.Empty;
135 public ulong XferID = 0; 135 public ulong XferID = 0;
136 public int DataPointer = 0; 136 public int DataPointer = 0;
137 public uint Packet = 0; 137 public uint Packet = 0;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index db3da48..31bd0b3 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -376,7 +376,7 @@ namespace OpenSim.Region.Environment.Scenes
376 InventoryItemBase item = userInfo.RootFolder.HasItem(itemID); 376 InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
377 if (item != null) 377 if (item != null)
378 { 378 {
379 if (newName != "") 379 if (newName != System.String.Empty)
380 { 380 {
381 item.inventoryName = newName; 381 item.inventoryName = newName;
382 } 382 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 575fe01..43486e8 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -389,7 +389,7 @@ namespace OpenSim.Region.Environment.Scenes
389 m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed); 389 m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed);
390 MainLog.Instance.Error("REGION", "Restarting Region in " + (seconds/60) + " minutes"); 390 MainLog.Instance.Error("REGION", "Restarting Region in " + (seconds/60) + " minutes");
391 m_restartTimer.Start(); 391 m_restartTimer.Start();
392 SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), "", RegionInfo.RegionName + ": Restarting in 2 Minutes"); 392 SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in 2 Minutes");
393 //SendGeneralAlert(RegionInfo.RegionName + ": Restarting in 2 Minutes"); 393 //SendGeneralAlert(RegionInfo.RegionName + ": Restarting in 2 Minutes");
394 } 394 }
395 } 395 }
@@ -404,7 +404,7 @@ namespace OpenSim.Region.Environment.Scenes
404 if (m_RestartTimerCounter <= m_incrementsof15seconds) 404 if (m_RestartTimerCounter <= m_incrementsof15seconds)
405 { 405 {
406 if (m_RestartTimerCounter == 4 || m_RestartTimerCounter == 6 || m_RestartTimerCounter == 7) 406 if (m_RestartTimerCounter == 4 || m_RestartTimerCounter == 6 || m_RestartTimerCounter == 7)
407 SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), "", RegionInfo.RegionName + ": Restarting in " + 407 SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in " +
408 ((8 - m_RestartTimerCounter) * 15) + " seconds"); 408 ((8 - m_RestartTimerCounter) * 15) + " seconds");
409 409
410 // SendGeneralAlert(RegionInfo.RegionName + ": Restarting in " + ((8 - m_RestartTimerCounter)*15) + 410 // SendGeneralAlert(RegionInfo.RegionName + ": Restarting in " + ((8 - m_RestartTimerCounter)*15) +
@@ -1408,7 +1408,7 @@ namespace OpenSim.Region.Environment.Scenes
1408 { 1408 {
1409 if (regionHandle == m_regInfo.RegionHandle) 1409 if (regionHandle == m_regInfo.RegionHandle)
1410 { 1410 {
1411 if (agent.CapsPath != "") 1411 if (agent.CapsPath != String.Empty)
1412 { 1412 {
1413 Caps cap = 1413 Caps cap =
1414 new Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port, 1414 new Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port,
@@ -2004,7 +2004,7 @@ namespace OpenSim.Region.Environment.Scenes
2004 2004
2005 private string CombineParams(string[] commandParams, int pos) 2005 private string CombineParams(string[] commandParams, int pos)
2006 { 2006 {
2007 string result = ""; 2007 string result = String.Empty;
2008 for (int i = pos; i < commandParams.Length; i++) 2008 for (int i = pos; i < commandParams.Length; i++)
2009 { 2009 {
2010 result += commandParams[i] + " "; 2010 result += commandParams[i] + " ";
@@ -2253,7 +2253,7 @@ namespace OpenSim.Region.Environment.Scenes
2253 /// </summary> 2253 /// </summary>
2254 /// <param name="avatarID">AvatarID to lookup</param> 2254 /// <param name="avatarID">AvatarID to lookup</param>
2255 /// <returns></returns> 2255 /// <returns></returns>
2256 public bool PresenceChildStatus(LLUUID avatarID) 2256 public override bool PresenceChildStatus(LLUUID avatarID)
2257 { 2257 {
2258 ScenePresence cp = GetScenePresence(avatarID); 2258 ScenePresence cp = GetScenePresence(avatarID);
2259 return cp.IsChildAgent; 2259 return cp.IsChildAgent;
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 3942397..29747c1 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.Environment.Scenes
54 54
55 55
56 public KillObjectDelegate KillObject; 56 public KillObjectDelegate KillObject;
57 public string _debugRegionName = ""; 57 public string _debugRegionName = String.Empty;
58 58
59 public string debugRegionName 59 public string debugRegionName
60 { 60 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 879e4a3..ffc72c9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1114,7 +1114,7 @@ namespace OpenSim.Region.Environment.Scenes
1114 { 1114 {
1115 return part.Name; 1115 return part.Name;
1116 } 1116 }
1117 return ""; 1117 return String.Empty;
1118 } 1118 }
1119 1119
1120 public string GetPartDescription(uint localID) 1120 public string GetPartDescription(uint localID)
@@ -1124,7 +1124,7 @@ namespace OpenSim.Region.Environment.Scenes
1124 { 1124 {
1125 return part.Description; 1125 return part.Description;
1126 } 1126 }
1127 return ""; 1127 return String.Empty;
1128 } 1128 }
1129 1129
1130 /// <summary> 1130 /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 1dd7e35..fc74c4e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Environment.Scenes
41{ 41{
42 public partial class SceneObjectPart : IScriptHost 42 public partial class SceneObjectPart : IScriptHost
43 { 43 {
44 private string m_inventoryFileName = ""; 44 private string m_inventoryFileName = String.Empty;
45 45
46 /// <summary> 46 /// <summary>
47 /// The inventory folder for this prim 47 /// The inventory folder for this prim
@@ -334,7 +334,7 @@ namespace OpenSim.Region.Environment.Scenes
334 334
335 public class InventoryStringBuilder 335 public class InventoryStringBuilder
336 { 336 {
337 public string BuildString = ""; 337 public string BuildString = String.Empty;
338 338
339 public InventoryStringBuilder(LLUUID folderID, LLUUID parentID) 339 public InventoryStringBuilder(LLUUID folderID, LLUUID parentID)
340 { 340 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 4456182..f2594a9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -395,7 +395,7 @@ namespace OpenSim.Region.Environment.Scenes
395 set { m_acceleration = value; } 395 set { m_acceleration = value; }
396 } 396 }
397 397
398 private string m_description = ""; 398 private string m_description = String.Empty;
399 399
400 public string Description 400 public string Description
401 { 401 {
@@ -418,7 +418,7 @@ namespace OpenSim.Region.Environment.Scenes
418 } 418 }
419 } 419 }
420 420
421 private string m_text = ""; 421 private string m_text = String.Empty;
422 422
423 public Vector3 SitTargetPosition 423 public Vector3 SitTargetPosition
424 { 424 {
@@ -440,7 +440,7 @@ namespace OpenSim.Region.Environment.Scenes
440 } 440 }
441 } 441 }
442 442
443 private string m_sitName = ""; 443 private string m_sitName = String.Empty;
444 444
445 public string SitName 445 public string SitName
446 { 446 {
@@ -448,7 +448,7 @@ namespace OpenSim.Region.Environment.Scenes
448 set { m_sitName = value; } 448 set { m_sitName = value; }
449 } 449 }
450 450
451 private string m_touchName = ""; 451 private string m_touchName = String.Empty;
452 452
453 public string TouchName 453 public string TouchName
454 { 454 {
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
index c1bf72b..58cf4c6 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
@@ -44,19 +44,19 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
44 44
45 public string SitName 45 public string SitName
46 { 46 {
47 get { return ""; } 47 get { return String.Empty; }
48 set { } 48 set { }
49 } 49 }
50 50
51 public string TouchName 51 public string TouchName
52 { 52 {
53 get { return ""; } 53 get { return String.Empty; }
54 set { } 54 set { }
55 } 55 }
56 56
57 public string Description 57 public string Description
58 { 58 {
59 get { return ""; } 59 get { return String.Empty; }
60 set { } 60 set { }
61 } 61 }
62 62
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
index 5dbe500..74f9358 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
88 //} 88 //}
89 //catch (Exception e) 89 //catch (Exception e)
90 //{ 90 //{
91 // m_log.Error("ScriptEngine", "Error loading assembly \"" + FileName + "\": " + e.ToString()); 91 // m_log.Error("ScriptEngine", "Error loading assembly \String.Empty + FileName + "\": " + e.ToString());
92 //} 92 //}
93 93
94 94
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
105 //} 105 //}
106 //catch (Exception e) 106 //catch (Exception e)
107 //{ 107 //{
108 // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString()); 108 // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString());
109 //} 109 //}
110 110
111 ScriptEngineInterface ret; 111 ScriptEngineInterface ret;
@@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
115 //} 115 //}
116 //catch (Exception e) 116 //catch (Exception e)
117 //{ 117 //{
118 // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString()); 118 // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString());
119 //} 119 //}
120 120
121 return ret; 121 return ret;
diff --git a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs b/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
index 70b957e..e654d2d 100644
--- a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
+++ b/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Environment.Types
262 public string[] GetNeighbours(string nodeName) 262 public string[] GetNeighbours(string nodeName)
263 { 263 {
264 string[] retVal = new string[1]; 264 string[] retVal = new string[1];
265 retVal[0] = ""; 265 retVal[0] = System.String.Empty;
266 return retVal; 266 return retVal;
267 } 267 }
268 } 268 }
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 9844f9e..8b8bcf4 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -88,7 +88,7 @@ namespace SimpleApp
88 m_commsManager = localComms; 88 m_commsManager = localComms;
89 89
90 LocalLoginService loginService = 90 LocalLoginService loginService =
91 new LocalLoginService(userService, "", localComms, m_networkServersInfo, false); 91 new LocalLoginService(userService, String.Empty, localComms, m_networkServersInfo, false);
92 loginService.OnLoginToRegion += backendService.AddNewSession; 92 loginService.OnLoginToRegion += backendService.AddNewSession;
93 93
94 m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); 94 m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
diff --git a/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs b/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
index a5c8f05..564dfee 100644
--- a/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Examples/SimpleApp/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
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -8,9 +36,9 @@ using System.Runtime.InteropServices;
8[assembly : AssemblyTitle("SimpleApp")] 36[assembly : AssemblyTitle("SimpleApp")]
9[assembly : AssemblyDescription("")] 37[assembly : AssemblyDescription("")]
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("Playahead AB")] 39[assembly : AssemblyCompany("OpenSimulator.org")]
12[assembly : AssemblyProduct("SimpleApp")] 40[assembly : AssemblyProduct("SimpleApp")]
13[assembly : AssemblyCopyright("Copyright © Playahead AB 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
index a25d027..6b1f291 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
50 { 50 {
51 /*if (args[0].ToLower() == "lslexport") 51 /*if (args[0].ToLower() == "lslexport")
52 { 52 {
53 string sequence = ""; 53 string sequence = String.Empty;
54 54
55 foreach (KeyValuePair<LLUUID, SceneObject> obj in script.world.Objects) 55 foreach (KeyValuePair<LLUUID, SceneObject> obj in script.world.Objects)
56 { 56 {
@@ -82,13 +82,13 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
82 LLVector3 scale = prim.Scale; 82 LLVector3 scale = prim.Scale;
83 LLVector3 rootPos = prim.WorldPos; 83 LLVector3 rootPos = prim.WorldPos;
84 84
85 string setPrimParams = ""; 85 string setPrimParams = String.Empty;
86 86
87 setPrimParams += "[PRIM_SCALE, " + scale.ToString() + ", PRIM_POS, " + rootPos.ToString() + ", PRIM_ROTATION, " + rot.ToString() + "]\n"; 87 setPrimParams += "[PRIM_SCALE, " + scale.ToString() + ", PRIM_POS, " + rootPos.ToString() + ", PRIM_ROTATION, " + rot.ToString() + "]\n";
88 88
89 return setPrimParams; 89 return setPrimParams;
90 */ 90 */
91 return ""; 91 return System.String.Empty;
92 } 92 }
93 } 93 }
94} \ No newline at end of file 94} \ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs
index b152df2..3e5ae5a 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs
@@ -237,7 +237,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
237 237
238 public class PoolUtf8 : PoolItem 238 public class PoolUtf8 : PoolItem
239 { 239 {
240 public string Value = ""; 240 public string Value = String.Empty;
241 241
242 public void readValue(byte[] data, ref int pointer, int length) 242 public void readValue(byte[] data, ref int pointer, int length)
243 { 243 {
@@ -274,7 +274,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
274 274
275 public class PoolClass : PoolItem 275 public class PoolClass : PoolItem
276 { 276 {
277 //public string name = ""; 277 //public string name = String.Empty;
278 public ushort namePointer = 0; 278 public ushort namePointer = 0;
279 private ClassRecord parent; 279 private ClassRecord parent;
280 public PoolUtf8 Name; 280 public PoolUtf8 Name;
@@ -384,7 +384,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
384 { 384 {
385 public ushort AccessFlags = 0; 385 public ushort AccessFlags = 0;
386 public ushort NameIndex = 0; 386 public ushort NameIndex = 0;
387 public string Name = ""; 387 public string Name = String.Empty;
388 public ushort DescriptorIndex = 0; 388 public ushort DescriptorIndex = 0;
389 public ushort AttributeCount = 0; 389 public ushort AttributeCount = 0;
390 public List<MethodAttribute> Attributes = new List<MethodAttribute>(); 390 public List<MethodAttribute> Attributes = new List<MethodAttribute>();
@@ -436,7 +436,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
436 public class MethodAttribute 436 public class MethodAttribute
437 { 437 {
438 public ushort NameIndex = 0; 438 public ushort NameIndex = 0;
439 public string Name = ""; 439 public string Name = String.Empty;
440 public Int32 Length = 0; 440 public Int32 Length = 0;
441 //for now only support code attribute 441 //for now only support code attribute
442 public ushort MaxStack = 0; 442 public ushort MaxStack = 0;
@@ -502,7 +502,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
502 public class SubAttribute 502 public class SubAttribute
503 { 503 {
504 public ushort NameIndex = 0; 504 public ushort NameIndex = 0;
505 public string Name = ""; 505 public string Name = String.Empty;
506 public Int32 Length = 0; 506 public Int32 Length = 0;
507 public byte[] Data; 507 public byte[] Data;
508 private ClassRecord parent; 508 private ClassRecord parent;
@@ -546,7 +546,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
546 { 546 {
547 public ushort AccessFlags = 0; 547 public ushort AccessFlags = 0;
548 public ushort NameIndex = 0; 548 public ushort NameIndex = 0;
549 public string Name = ""; 549 public string Name = String.Empty;
550 public ushort DescriptorIndex = 0; 550 public ushort DescriptorIndex = 0;
551 public ushort AttributeCount = 0; 551 public ushort AttributeCount = 0;
552 public List<FieldAttribute> Attributes = new List<FieldAttribute>(); 552 public List<FieldAttribute> Attributes = new List<FieldAttribute>();
@@ -605,7 +605,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
605 public class FieldAttribute 605 public class FieldAttribute
606 { 606 {
607 public ushort NameIndex = 0; 607 public ushort NameIndex = 0;
608 public string Name = ""; 608 public string Name = String.Empty;
609 public Int32 Length = 0; 609 public Int32 Length = 0;
610 public byte[] Data; 610 public byte[] Data;
611 private ClassRecord parent; 611 private ClassRecord parent;
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
index fb8a16e..59f4c0e 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
@@ -46,8 +46,8 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
46 string typ = 46 string typ =
47 ((ClassRecord.PoolMethodRef) m_thread.currentClass.m_constantsPool[refIndex - 1]). 47 ((ClassRecord.PoolMethodRef) m_thread.currentClass.m_constantsPool[refIndex - 1]).
48 mNameType.Type.Value; 48 mNameType.Type.Value;
49 string typeparam = ""; 49 string typeparam = System.String.Empty;
50 string typereturn = ""; 50 string typereturn = System.String.Empty;
51 int firstbrak = 0; 51 int firstbrak = 0;
52 int secondbrak = 0; 52 int secondbrak = 0;
53 firstbrak = typ.LastIndexOf('('); 53 firstbrak = typ.LastIndexOf('(');
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
index a88299e..082021f 100644
--- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
+++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
@@ -976,7 +976,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin
976 public class BulletXCharacter : BulletXActor 976 public class BulletXCharacter : BulletXActor
977 { 977 {
978 public BulletXCharacter(BulletXScene parent_scene, PhysicsVector pos) 978 public BulletXCharacter(BulletXScene parent_scene, PhysicsVector pos)
979 : this("", parent_scene, pos) 979 : this(String.Empty, parent_scene, pos)
980 { 980 {
981 } 981 }
982 982
diff --git a/OpenSim/Region/Physics/Meshing/SimpleHull.cs b/OpenSim/Region/Physics/Meshing/SimpleHull.cs
index 809f3d5..4532bda 100644
--- a/OpenSim/Region/Physics/Meshing/SimpleHull.cs
+++ b/OpenSim/Region/Physics/Meshing/SimpleHull.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Physics.Meshing
53 53
54 public override String ToString() 54 public override String ToString()
55 { 55 {
56 String result = ""; 56 String result = String.Empty;
57 foreach (Vertex v in vertices) 57 foreach (Vertex v in vertices)
58 { 58 {
59 result += "b:" + v.ToString() + "\n"; 59 result += "b:" + v.ToString() + "\n";
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index b824cbe..bfdb90f 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Physics.OdePlugin
83 private bool m_alwaysRun = false; 83 private bool m_alwaysRun = false;
84 private bool m_hackSentFall = false; 84 private bool m_hackSentFall = false;
85 private bool m_hackSentFly = false; 85 private bool m_hackSentFly = false;
86 private string m_name = ""; 86 private string m_name = String.Empty;
87 87
88 private bool[] m_colliderarr = new bool[11]; 88 private bool[] m_colliderarr = new bool[11];
89 private bool[] m_colliderGroundarr = new bool[11]; 89 private bool[] m_colliderGroundarr = new bool[11];
diff --git a/OpenSim/Region/ScriptEngine/Common/Executor.cs b/OpenSim/Region/ScriptEngine/Common/Executor.cs
index 1805e38..df28d7d 100644
--- a/OpenSim/Region/ScriptEngine/Common/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Common/Executor.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.ScriptEngine.Common
88 88
89 //type.InvokeMember(EventName, BindingFlags.InvokeMethod, null, m_Script, args); 89 //type.InvokeMember(EventName, BindingFlags.InvokeMethod, null, m_Script, args);
90 90
91 //Console.WriteLine("ScriptEngine Executor.ExecuteEvent: \"" + EventName + "\""); 91 //Console.WriteLine("ScriptEngine Executor.ExecuteEvent: \String.Empty + EventName + "\String.Empty);
92 92
93 if (Events.ContainsKey(EventName) == false) 93 if (Events.ContainsKey(EventName) == false)
94 { 94 {
@@ -112,7 +112,7 @@ namespace OpenSim.Region.ScriptEngine.Common
112 112
113 if (ev == null) // No event by that name! 113 if (ev == null) // No event by that name!
114 { 114 {
115 //Console.WriteLine("ScriptEngine Can not find any event named: \"" + EventName + "\""); 115 //Console.WriteLine("ScriptEngine Can not find any event named: \String.Empty + EventName + "\String.Empty);
116 return; 116 return;
117 } 117 }
118 118
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs
index 33e5c68..5149f3a 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.Common
79 79
80 80
81 public LSL_BuiltIn_Commands_Interface m_LSL_Functions; 81 public LSL_BuiltIn_Commands_Interface m_LSL_Functions;
82 private string _Source = ""; 82 private string _Source = String.Empty;
83 public string Source 83 public string Source
84 { 84 {
85 get 85 get
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 4cceb5f..1400617 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -297,7 +297,7 @@ namespace OpenSim.Region.ScriptEngine.Common
297 297
298 public int llListen(int channelID, string name, string ID, string msg) 298 public int llListen(int channelID, string name, string ID, string msg)
299 { 299 {
300 if (ID == "") 300 if (ID == String.Empty)
301 { 301 {
302 ID = LLUUID.Zero.ToString(); 302 ID = LLUUID.Zero.ToString();
303 } 303 }
@@ -338,19 +338,19 @@ namespace OpenSim.Region.ScriptEngine.Common
338 public string llDetectedName(int number) 338 public string llDetectedName(int number)
339 { 339 {
340 NotImplemented("llDetectedName"); 340 NotImplemented("llDetectedName");
341 return ""; 341 return String.Empty;
342 } 342 }
343 343
344 public string llDetectedKey(int number) 344 public string llDetectedKey(int number)
345 { 345 {
346 NotImplemented("llDetectedKey"); 346 NotImplemented("llDetectedKey");
347 return ""; 347 return String.Empty;
348 } 348 }
349 349
350 public string llDetectedOwner(int number) 350 public string llDetectedOwner(int number)
351 { 351 {
352 NotImplemented("llDetectedOwner"); 352 NotImplemented("llDetectedOwner");
353 return ""; 353 return String.Empty;
354 } 354 }
355 355
356 public int llDetectedType(int number) 356 public int llDetectedType(int number)
@@ -693,7 +693,7 @@ namespace OpenSim.Region.ScriptEngine.Common
693 return texface.TextureID.ToString(); 693 return texface.TextureID.ToString();
694 } 694 }
695 NotImplemented("llGetTexture"); 695 NotImplemented("llGetTexture");
696 return ""; 696 return String.Empty;
697 } 697 }
698 698
699 public void llSetPos(LSL_Types.Vector3 pos) 699 public void llSetPos(LSL_Types.Vector3 pos)
@@ -1175,7 +1175,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1175 public string llGetPermissionsKey() 1175 public string llGetPermissionsKey()
1176 { 1176 {
1177 NotImplemented("llGetPermissionsKey"); 1177 NotImplemented("llGetPermissionsKey");
1178 return ""; 1178 return String.Empty;
1179 } 1179 }
1180 1180
1181 public int llGetPermissions() 1181 public int llGetPermissions()
@@ -1336,7 +1336,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1336 public string llGetInventoryName(int type, int number) 1336 public string llGetInventoryName(int type, int number)
1337 { 1337 {
1338 NotImplemented("llGetInventoryName"); 1338 NotImplemented("llGetInventoryName");
1339 return ""; 1339 return String.Empty;
1340 } 1340 }
1341 1341
1342 public void llSetScriptState(string name, int run) 1342 public void llSetScriptState(string name, int run)
@@ -1378,13 +1378,13 @@ namespace OpenSim.Region.ScriptEngine.Common
1378 public string llRequestAgentData(string id, int data) 1378 public string llRequestAgentData(string id, int data)
1379 { 1379 {
1380 NotImplemented("llRequestAgentData"); 1380 NotImplemented("llRequestAgentData");
1381 return ""; 1381 return String.Empty;
1382 } 1382 }
1383 1383
1384 public string llRequestInventoryData(string name) 1384 public string llRequestInventoryData(string name)
1385 { 1385 {
1386 NotImplemented("llRequestInventoryData"); 1386 NotImplemented("llRequestInventoryData");
1387 return ""; 1387 return String.Empty;
1388 } 1388 }
1389 1389
1390 public void llSetDamage(double damage) 1390 public void llSetDamage(double damage)
@@ -1473,7 +1473,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1473 public string llGetAnimation(string id) 1473 public string llGetAnimation(string id)
1474 { 1474 {
1475 NotImplemented("llGetAnimation"); 1475 NotImplemented("llGetAnimation");
1476 return ""; 1476 return String.Empty;
1477 } 1477 }
1478 1478
1479 public void llResetScript() 1479 public void llResetScript()
@@ -1495,7 +1495,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1495 1495
1496 public string llGetScriptName() 1496 public string llGetScriptName()
1497 { 1497 {
1498 return ""; 1498 return String.Empty;
1499 } 1499 }
1500 1500
1501 public int llGetNumberOfSides() 1501 public int llGetNumberOfSides()
@@ -1534,7 +1534,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1534 1534
1535 public string llGetInventoryKey(string name) 1535 public string llGetInventoryKey(string name)
1536 { 1536 {
1537 return ""; 1537 return String.Empty;
1538 } 1538 }
1539 1539
1540 public void llAllowInventoryDrop(int add) 1540 public void llAllowInventoryDrop(int add)
@@ -1592,7 +1592,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1592 public string llGetOwnerKey(string id) 1592 public string llGetOwnerKey(string id)
1593 { 1593 {
1594 NotImplemented("llGetOwnerKey"); 1594 NotImplemented("llGetOwnerKey");
1595 return ""; 1595 return String.Empty;
1596 } 1596 }
1597 1597
1598 public LSL_Types.Vector3 llGetCenterOfMass() 1598 public LSL_Types.Vector3 llGetCenterOfMass()
@@ -1610,14 +1610,14 @@ namespace OpenSim.Region.ScriptEngine.Common
1610 // s = 1; 1610 // s = 1;
1611 //int c = 0; 1611 //int c = 0;
1612 //LSL_Types.list chunk = new LSL_Types.list(); 1612 //LSL_Types.list chunk = new LSL_Types.list();
1613 //string chunkString = ""; 1613 //string chunkString = String.Empty;
1614 //foreach (string element in src) 1614 //foreach (string element in src)
1615 //{ 1615 //{
1616 // c++; 1616 // c++;
1617 // if (c > s) 1617 // if (c > s)
1618 // { 1618 // {
1619 // sorted.Add(chunkString, chunk); 1619 // sorted.Add(chunkString, chunk);
1620 // chunkString = ""; 1620 // chunkString = String.Empty;
1621 // chunk = new LSL_Types.list(); 1621 // chunk = new LSL_Types.list();
1622 // c = 0; 1622 // c = 0;
1623 // } 1623 // }
@@ -1693,7 +1693,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1693 } 1693 }
1694 if (index >= src.Length) 1694 if (index >= src.Length)
1695 { 1695 {
1696 return ""; 1696 return String.Empty;
1697 } 1697 }
1698 return src.Data[index].ToString(); 1698 return src.Data[index].ToString();
1699 } 1699 }
@@ -1814,7 +1814,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1814 1814
1815 public string llList2CSV(LSL_Types.list src) 1815 public string llList2CSV(LSL_Types.list src)
1816 { 1816 {
1817 string ret = ""; 1817 string ret = String.Empty;
1818 foreach (object o in src.Data) 1818 foreach (object o in src.Data)
1819 { 1819 {
1820 ret = ret + o.ToString() + ","; 1820 ret = ret + o.ToString() + ",";
@@ -1968,7 +1968,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1968 public string llKey2Name(string id) 1968 public string llKey2Name(string id)
1969 { 1969 {
1970 NotImplemented("llKey2Name"); 1970 NotImplemented("llKey2Name");
1971 return ""; 1971 return String.Empty;
1972 } 1972 }
1973 1973
1974 public void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate) 1974 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
2006 public string llGetNotecardLine(string name, int line) 2006 public string llGetNotecardLine(string name, int line)
2007 { 2007 {
2008 NotImplemented("llGetNotecardLine"); 2008 NotImplemented("llGetNotecardLine");
2009 return ""; 2009 return String.Empty;
2010 } 2010 }
2011 2011
2012 public LSL_Types.Vector3 llGetAgentSize(string id) 2012 public LSL_Types.Vector3 llGetAgentSize(string id)
@@ -2257,7 +2257,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2257 if (AVID != LLUUID.Zero) 2257 if (AVID != LLUUID.Zero)
2258 return AVID.ToString(); 2258 return AVID.ToString();
2259 else 2259 else
2260 return ""; 2260 return String.Empty;
2261 } 2261 }
2262 2262
2263 public void llAddToLandPassList(string avatar, double hours) 2263 public void llAddToLandPassList(string avatar, double hours)
@@ -2289,9 +2289,9 @@ namespace OpenSim.Region.ScriptEngine.Common
2289 { 2289 {
2290 if (src.Length == 0) 2290 if (src.Length == 0)
2291 { 2291 {
2292 return ""; 2292 return String.Empty;
2293 } 2293 }
2294 string ret = ""; 2294 string ret = String.Empty;
2295 foreach (object o in src.Data) 2295 foreach (object o in src.Data)
2296 { 2296 {
2297 ret = ret + o.ToString() + seperator; 2297 ret = ret + o.ToString() + seperator;
@@ -2352,7 +2352,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2352 if (xmlrpcMod.IsEnabled()) 2352 if (xmlrpcMod.IsEnabled())
2353 { 2353 {
2354 LLUUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID); 2354 LLUUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID);
2355 object[] resobj = new object[] { 1, channelID.ToString(), LLUUID.Zero.ToString(), "", 0, "" }; 2355 object[] resobj = new object[] { 1, channelID.ToString(), LLUUID.Zero.ToString(), String.Empty, 0, String.Empty };
2356 m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(m_localID, m_itemID, "remote_data", resobj); 2356 m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(m_localID, m_itemID, "remote_data", resobj);
2357 } 2357 }
2358 } 2358 }
@@ -2360,7 +2360,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2360 public string llSendRemoteData(string channel, string dest, int idata, string sdata) 2360 public string llSendRemoteData(string channel, string dest, int idata, string sdata)
2361 { 2361 {
2362 NotImplemented("llSendRemoteData"); 2362 NotImplemented("llSendRemoteData");
2363 return ""; 2363 return String.Empty;
2364 } 2364 }
2365 2365
2366 public void llRemoteDataReply(string channel, string message_id, string sdata, int idata) 2366 public void llRemoteDataReply(string channel, string message_id, string sdata, int idata)
@@ -2578,7 +2578,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2578 public string llGetNumberOfNotecardLines(string name) 2578 public string llGetNumberOfNotecardLines(string name)
2579 { 2579 {
2580 NotImplemented("llGetNumberOfNotecardLines"); 2580 NotImplemented("llGetNumberOfNotecardLines");
2581 return ""; 2581 return String.Empty;
2582 } 2582 }
2583 2583
2584 public LSL_Types.list llGetBoundingBox(string obj) 2584 public LSL_Types.list llGetBoundingBox(string obj)
@@ -2600,7 +2600,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2600 public string llIntegerToBase64(int number) 2600 public string llIntegerToBase64(int number)
2601 { 2601 {
2602 NotImplemented("llIntegerToBase64"); 2602 NotImplemented("llIntegerToBase64");
2603 return ""; 2603 return String.Empty;
2604 } 2604 }
2605 2605
2606 public int llBase64ToInteger(string str) 2606 public int llBase64ToInteger(string str)
@@ -2660,7 +2660,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2660 public string llGetInventoryCreator(string item) 2660 public string llGetInventoryCreator(string item)
2661 { 2661 {
2662 NotImplemented("llGetInventoryCreator"); 2662 NotImplemented("llGetInventoryCreator");
2663 return ""; 2663 return String.Empty;
2664 } 2664 }
2665 2665
2666 public void llOwnerSay(string msg) 2666 public void llOwnerSay(string msg)
@@ -2828,7 +2828,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2828 2828
2829 public string llXorBase64StringsCorrect(string str1, string str2) 2829 public string llXorBase64StringsCorrect(string str1, string str2)
2830 { 2830 {
2831 string ret = ""; 2831 string ret = String.Empty;
2832 string src1 = llBase64ToString(str1); 2832 string src1 = llBase64ToString(str1);
2833 string src2 = llBase64ToString(str2); 2833 string src2 = llBase64ToString(str2);
2834 int c = 0; 2834 int c = 0;
@@ -3002,7 +3002,7 @@ namespace OpenSim.Region.ScriptEngine.Common
3002 public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, 3002 public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams,
3003 int timer) 3003 int timer)
3004 { 3004 {
3005 if (dynamicID == "") 3005 if (dynamicID == String.Empty)
3006 { 3006 {
3007 IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); 3007 IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
3008 LLUUID createdTexture = 3008 LLUUID createdTexture =
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
index 0ae7a0a..e48f667 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
@@ -429,10 +429,10 @@ namespace OpenSim.Region.ScriptEngine.Common
429 public override string ToString() 429 public override string ToString()
430 { 430 {
431 string output; 431 string output;
432 output = ""; 432 output = String.Empty;
433 if (m_data.Length == 0) 433 if (m_data.Length == 0)
434 { 434 {
435 return ""; 435 return String.Empty;
436 } 436 }
437 foreach (object o in m_data) 437 foreach (object o in m_data)
438 { 438 {
diff --git a/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs
index 48cf45a..1572a51 100644
--- a/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Common/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
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using 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.Region.ScriptEngine.Common")] 40[assembly : AssemblyProduct("OpenSim.Region.ScriptEngine.Common")]
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/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
index 6df8343..0a8f7ea 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
@@ -148,7 +148,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
148 // Handled by long commands 148 // Handled by long commands
149 public void timer(uint localID, LLUUID itemID) 149 public void timer(uint localID, LLUUID itemID)
150 { 150 {
151 //myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, ""); 151 //myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, String.Empty);
152 } 152 }
153 153
154 public void listen(uint localID, LLUUID itemID) 154 public void listen(uint localID, LLUUID itemID)
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
index 8081e2c..af91027 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
@@ -323,7 +323,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
323 // Do we have any scripts in this object at all? If not, return 323 // Do we have any scripts in this object at all? If not, return
324 if (m_ScriptEngine.m_ScriptManager.Scripts.ContainsKey(localID) == false) 324 if (m_ScriptEngine.m_ScriptManager.Scripts.ContainsKey(localID) == false)
325 { 325 {
326 //Console.WriteLine("Event \"" + FunctionName + "\" for localID: " + localID + ". No scripts found on this localID."); 326 //Console.WriteLine("Event \String.Empty + FunctionName + "\" for localID: " + localID + ". No scripts found on this localID.");
327 return; 327 return;
328 } 328 }
329 329
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs
index 635c32a..7271d72 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs
@@ -259,7 +259,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
259 //Deliver data to prim's remote_data handler 259 //Deliver data to prim's remote_data handler
260 object[] resobj = new object[] 260 object[] resobj = new object[]
261 { 261 {
262 2, rInfo.GetChannelKey().ToString(), rInfo.GetMessageID().ToString(), "", 262 2, rInfo.GetChannelKey().ToString(), rInfo.GetMessageID().ToString(), String.Empty,
263 rInfo.GetIntValue(), 263 rInfo.GetIntValue(),
264 rInfo.GetStrVal() 264 rInfo.GetStrVal()
265 }; 265 };
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
index 8f74620..784e849 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
@@ -161,7 +161,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
161 catch (ThreadAbortException tae) 161 catch (ThreadAbortException tae)
162 { 162 {
163 string a = tae.ToString(); 163 string a = tae.ToString();
164 a = ""; 164 a = String.Empty;
165 // Expected 165 // Expected
166 } 166 }
167 } 167 }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index 9cd22e2..2adc060 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -143,7 +143,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
143 // TODO: Return errors to user somehow 143 // TODO: Return errors to user somehow
144 if (results.Errors.Count > 0) 144 if (results.Errors.Count > 0)
145 { 145 {
146 string errtext = ""; 146 string errtext = String.Empty;
147 foreach (CompilerError CompErr in results.Errors) 147 foreach (CompilerError CompErr in results.Errors)
148 { 148 {
149 errtext += "Line number " + (CompErr.Line - 1) + 149 errtext += "Line number " + (CompErr.Line - 1) +
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
index 724d8f5..f3302ee 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -28,6 +28,7 @@
28 28
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text.RegularExpressions; 30using System.Text.RegularExpressions;
31using System;
31 32
32namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL 33namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
33{ 34{
@@ -58,7 +59,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
58 public string Convert(string Script) 59 public string Convert(string Script)
59 { 60 {
60 quotes.Clear(); 61 quotes.Clear();
61 string Return = ""; 62 string Return = System.String.Empty;
62 Script = " \r\n" + Script; 63 Script = " \r\n" + Script;
63 64
64 // 65 //
@@ -72,13 +73,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
72 73
73 // QUOTE REPLACEMENT 74 // QUOTE REPLACEMENT
74 // temporarily replace quotes so we can work our magic on the script without 75 // temporarily replace quotes so we can work our magic on the script without
75 // always considering if we are inside our outside ""'s 76 // always considering if we are inside our outside String.Empty's
76 string _Script = ""; 77 string _Script = System.String.Empty;
77 string C; 78 string C;
78 bool in_quote = false; 79 bool in_quote = false;
79 bool quote_replaced = false; 80 bool quote_replaced = false;
80 string quote_replacement_string = "Q_U_O_T_E_REPLACEMENT_"; 81 string quote_replacement_string = "Q_U_O_T_E_REPLACEMENT_";
81 string quote = ""; 82 string quote = System.String.Empty;
82 bool last_was_escape = false; 83 bool last_was_escape = false;
83 int quote_replaced_count = 0; 84 int quote_replaced_count = 0;
84 for (int p = 0; p < Script.Length; p++) 85 for (int p = 0; p < Script.Length; p++)
@@ -97,7 +98,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
97 } 98 }
98 else 99 else
99 { 100 {
100 if (quote == "") 101 if (quote == System.String.Empty)
101 { 102 {
102 // We didn't replace quote, probably because of empty string? 103 // We didn't replace quote, probably because of empty string?
103 _Script += quote_replacement_string + 104 _Script += quote_replacement_string +
@@ -107,7 +108,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
107 quotes.Add( 108 quotes.Add(
108 quote_replacement_string + 109 quote_replacement_string +
109 quote_replaced_count.ToString().PadLeft(5, "0".ToCharArray()[0]), quote); 110 quote_replaced_count.ToString().PadLeft(5, "0".ToCharArray()[0]), quote);
110 quote = ""; 111 quote = System.String.Empty;
111 } 112 }
112 break; 113 break;
113 } 114 }
@@ -151,10 +152,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
151 // 152 //
152 int ilevel = 0; 153 int ilevel = 0;
153 int lastlevel = 0; 154 int lastlevel = 0;
154 string ret = ""; 155 string ret = System.String.Empty;
155 string cache = ""; 156 string cache = System.String.Empty;
156 bool in_state = false; 157 bool in_state = false;
157 string current_statename = ""; 158 string current_statename = System.String.Empty;
158 for (int p = 0; p < Script.Length; p++) 159 for (int p = 0; p < Script.Length; p++)
159 { 160 {
160 C = Script.Substring(p, 1); 161 C = Script.Substring(p, 1);
@@ -191,7 +192,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
191 RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); 192 RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
192 } 193 }
193 ret += cache; 194 ret += cache;
194 cache = ""; 195 cache = String.Empty;
195 } 196 }
196 if (ilevel == 0 && lastlevel == 1) 197 if (ilevel == 0 && lastlevel == 1)
197 { 198 {
@@ -199,7 +200,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
199 if (in_state == true) 200 if (in_state == true)
200 { 201 {
201 cache = cache.Remove(cache.Length - 1, 1); 202 cache = cache.Remove(cache.Length - 1, 1);
202 //cache = Regex.Replace(cache, "}$", "", RegexOptions.Multiline | RegexOptions.Singleline); 203 //cache = Regex.Replace(cache, "}$", String.Empty, RegexOptions.Multiline | RegexOptions.Singleline);
203 204
204 //Replace function names 205 //Replace function names
205 // void dataserver(key query_id, string data) { 206 // void dataserver(key query_id, string data) {
@@ -213,9 +214,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
213 } 214 }
214 215
215 ret += cache; 216 ret += cache;
216 cache = ""; 217 cache = String.Empty;
217 in_state = true; 218 in_state = true;
218 current_statename = ""; 219 current_statename = String.Empty;
219 } 220 }
220 221
221 break; 222 break;
@@ -223,10 +224,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
223 lastlevel = ilevel; 224 lastlevel = ilevel;
224 } 225 }
225 ret += cache; 226 ret += cache;
226 cache = ""; 227 cache = String.Empty;
227 228
228 Script = ret; 229 Script = ret;
229 ret = ""; 230 ret = String.Empty;
230 231
231 232
232 foreach (string key in dataTypes.Keys) 233 foreach (string key in dataTypes.Keys)
@@ -287,7 +288,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
287 288
288 // Add namespace, class name and inheritance 289 // Add namespace, class name and inheritance
289 290
290 Return = "" + 291 Return = String.Empty +
291 "using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic;"; 292 "using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic;";
292 //"using System; " + 293 //"using System; " +
293 //"using System.Collections.Generic; " + 294 //"using System.Collections.Generic; " +
@@ -309,9 +310,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
309 //} 310 //}
310 311
311 312
312 Return += "" + 313 Return += String.Empty +
313 "namespace SecondLife { "; 314 "namespace SecondLife { ";
314 Return += "" + 315 Return += String.Empty +
315 //"[Serializable] " + 316 //"[Serializable] " +
316 "public class Script : OpenSim.Region.ScriptEngine.Common.LSL_BaseClass { "; 317 "public class Script : OpenSim.Region.ScriptEngine.Common.LSL_BaseClass { ";
317 Return += @"public Script() { } "; 318 Return += @"public Script() { } ";
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs
index 00027ca..e484906 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/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
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using 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.Region.ScriptEngine.DotNetEngine")] 40[assembly : AssemblyProduct("OpenSim.Region.ScriptEngine.DotNetEngine")]
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/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 0c28ac7..2bb40ee 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
64 64
65 // We will initialize and start the script. 65 // We will initialize and start the script.
66 // It will be up to the script itself to hook up the correct events. 66 // It will be up to the script itself to hook up the correct events.
67 string ScriptSource = ""; 67 string ScriptSource = String.Empty;
68 68
69 SceneObjectPart m_host = World.GetSceneObjectPart(localID); 69 SceneObjectPart m_host = World.GetSceneObjectPart(localID);
70 70
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs
index 6dde3e5..c6fa4ce 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
63 LSOEngine.LSO.Common.SendToLog("Assembly name: " + asmName.Name); 63 LSOEngine.LSO.Common.SendToLog("Assembly name: " + asmName.Name);
64 LSOEngine.LSO.Common.SendToLog("Assembly File Name: " + asmName.Name + ".dll"); 64 LSOEngine.LSO.Common.SendToLog("Assembly File Name: " + asmName.Name + ".dll");
65 LSOEngine.LSO.Common.SendToLog("Starting processing of LSL ByteCode..."); 65 LSOEngine.LSO.Common.SendToLog("Starting processing of LSL ByteCode...");
66 LSOEngine.LSO.Common.SendToLog(""); 66 LSOEngine.LSO.Common.SendToLog(String.Empty);
67 67
68 68
69 // Create Assembly 69 // Create Assembly
@@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
81 (asmName.Name, 81 (asmName.Name,
82 DLL_FileName); 82 DLL_FileName);
83 83
84 //Common.SendToDebug("asmName.Name is still \"" + asmName.Name + "\""); 84 //Common.SendToDebug("asmName.Name is still \String.Empty + asmName.Name + "\String.Empty);
85 // Create a Class (/Type) 85 // Create a Class (/Type)
86 TypeBuilder typeBuilder = modBuilder.DefineType( 86 TypeBuilder typeBuilder = modBuilder.DefineType(
87 "LSL_ScriptObject", 87 "LSL_ScriptObject",
@@ -152,7 +152,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
152 152
153 //foreach (string s in ret) 153 //foreach (string s in ret)
154 //{ 154 //{
155 // Common.SendToLog(""); 155 // Common.SendToLog(String.Empty);
156 // Common.SendToLog("*** Executing LSL Server Event: " + s); 156 // Common.SendToLog("*** Executing LSL Server Event: " + s);
157 // //object test = type.GetMember(s); 157 // //object test = type.GetMember(s);
158 // //object runner = type.InvokeMember(s, BindingFlags.Public | BindingFlags.InvokeMethod | BindingFlags.Instance, null, MyScript, args); 158 // //object runner = type.InvokeMember(s, BindingFlags.Public | BindingFlags.InvokeMethod | BindingFlags.Instance, null, MyScript, args);
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
index d0cc0f9..efe8648 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
@@ -430,7 +430,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
430 430
431 private string Read_String() 431 private string Read_String()
432 { 432 {
433 string ret = ""; 433 string ret = String.Empty;
434 byte reader = br_read(1)[0]; 434 byte reader = br_read(1)[0];
435 while (reader != 0x000) 435 while (reader != 0x000)
436 { 436 {
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs
index 78014d6..763a759 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/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
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using 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.Region.ScriptEngine.LSOEngine")] 40[assembly: AssemblyProduct("OpenSim.Region.ScriptEngine.LSOEngine")]
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/Region/ScriptEngine/LSOEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
index 56c422f..bd26ce4 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
61 61
62 // We will initialize and start the script. 62 // We will initialize and start the script.
63 // It will be up to the script itself to hook up the correct events. 63 // It will be up to the script itself to hook up the correct events.
64 string ScriptSource = ""; 64 string ScriptSource = String.Empty;
65 65
66 SceneObjectPart m_host = World.GetSceneObjectPart(localID); 66 SceneObjectPart m_host = World.GetSceneObjectPart(localID);
67 67
diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs
index d78caf9..0462ba4 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/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
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using 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.Region.ScriptEngine.RemoteServer")] 40[assembly : AssemblyProduct("OpenSim.Region.ScriptEngine.RemoteServer")]
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/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
index ac9b741..d6c4675 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
@@ -798,7 +798,7 @@ namespace OpenSim.DataStore.MSSQL
798 private SqlCommand createUpdateCommand(string table, string pk, DataTable dt) 798 private SqlCommand createUpdateCommand(string table, string pk, DataTable dt)
799 { 799 {
800 string sql = "update " + table + " set "; 800 string sql = "update " + table + " set ";
801 string subsql = ""; 801 string subsql = String.Empty;
802 foreach (DataColumn col in dt.Columns) 802 foreach (DataColumn col in dt.Columns)
803 { 803 {
804 if (subsql.Length > 0) 804 if (subsql.Length > 0)
@@ -825,7 +825,7 @@ namespace OpenSim.DataStore.MSSQL
825 private string defineTable(DataTable dt) 825 private string defineTable(DataTable dt)
826 { 826 {
827 string sql = "create table " + dt.TableName + "("; 827 string sql = "create table " + dt.TableName + "(";
828 string subsql = ""; 828 string subsql = String.Empty;
829 foreach (DataColumn col in dt.Columns) 829 foreach (DataColumn col in dt.Columns)
830 { 830 {
831 if (subsql.Length > 0) 831 if (subsql.Length > 0)
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs
index 7608202..3d4dd3c 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/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
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using 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.DataStore.NullStorage")] 40[assembly : AssemblyProduct("OpenSim.DataStore.NullStorage")]
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/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
index 3195140..33537fa 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
@@ -37,7 +37,7 @@ using System.Runtime.InteropServices;
37[assembly : AssemblyConfiguration("")] 37[assembly : AssemblyConfiguration("")]
38[assembly : AssemblyCompany("")] 38[assembly : AssemblyCompany("")]
39[assembly : AssemblyProduct("OpenSim.Region.Terrain.BasicTerrain")] 39[assembly : AssemblyProduct("OpenSim.Region.Terrain.BasicTerrain")]
40[assembly : AssemblyCopyright("Copyright © 2007")] 40[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
43 43
generated by cgit v1.1 at 2024-11-06 04:18:29 +0000