aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2008-05-01 14:45:56 +0000
committerAdam Frisby2008-05-01 14:45:56 +0000
commit4692e92312ceacf414629eb78f6d0725a2eb2ca5 (patch)
tree34da13ca5f7f19fc447f4fd341a43703183cfd55
parentUpdate svn properties. Minor formatting cleanup. (diff)
downloadopensim-SC_OLD-4692e92312ceacf414629eb78f6d0725a2eb2ca5.zip
opensim-SC_OLD-4692e92312ceacf414629eb78f6d0725a2eb2ca5.tar.gz
opensim-SC_OLD-4692e92312ceacf414629eb78f6d0725a2eb2ca5.tar.bz2
opensim-SC_OLD-4692e92312ceacf414629eb78f6d0725a2eb2ca5.tar.xz
* Assorted spring cleanings.
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs5
-rw-r--r--OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs1
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs3
-rw-r--r--OpenSim/Framework/UserAppearance.cs1
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/MessageService.cs1
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs5
-rw-r--r--OpenSim/Region/Application/OpenSimMainConsole.cs32
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs2
-rw-r--r--OpenSim/Region/Environment/ModuleLoader.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/UndoState.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs6
19 files changed, 28 insertions, 48 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 5a3d350..ea12a48 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using System.Threading;
33using libsecondlife; 34using libsecondlife;
34using log4net; 35using log4net;
35using Mono.Data.SqliteClient; 36using Mono.Data.SqliteClient;
@@ -990,13 +991,13 @@ namespace OpenSim.Data.SQLite
990 991
991 m_log.Error("[REGION DB]: The land table was recently updated. You need to restart the simulator. Exiting now."); 992 m_log.Error("[REGION DB]: The land table was recently updated. You need to restart the simulator. Exiting now.");
992 993
993 System.Threading.Thread.Sleep(10000); 994 Thread.Sleep(10000);
994 995
995 // ICK! but it's better then A thousand red SQLITE error messages! 996 // ICK! but it's better then A thousand red SQLITE error messages!
996 Environment.Exit(0); 997 Environment.Exit(0);
997 998
998 } 999 }
999 catch (System.Exception) 1000 catch (Exception)
1000 { 1001 {
1001 // ICK! but it's better then A thousand red SQLITE error messages! 1002 // ICK! but it's better then A thousand red SQLITE error messages!
1002 m_log.Error("[REGION DB]: The land table was recently updated. You need to restart the simulator"); 1003 m_log.Error("[REGION DB]: The land table was recently updated. You need to restart the simulator");
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
index 4dcf755..f6accf6 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
@@ -26,9 +26,9 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife;
29//using System.Reflection; 30//using System.Reflection;
30 31
31using libsecondlife;
32//using log4net; 32//using log4net;
33 33
34namespace OpenSim.Framework.Communications.Cache 34namespace OpenSim.Framework.Communications.Cache
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 049b4a1..392d796 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -29,7 +29,6 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Threading; 31using System.Threading;
32
33using libsecondlife; 32using libsecondlife;
34using log4net; 33using log4net;
35 34
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index adaec4e..0b22d0e 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -26,12 +26,11 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.Text.RegularExpressions;
32using System.Diagnostics; 30using System.Diagnostics;
33using System.Net; 31using System.Net;
34using System.Reflection; 32using System.Reflection;
33using System.Text.RegularExpressions;
35using log4net; 34using log4net;
36 35
37namespace OpenSim.Framework.Console 36namespace OpenSim.Framework.Console
diff --git a/OpenSim/Framework/UserAppearance.cs b/OpenSim/Framework/UserAppearance.cs
index f9e27fa..b58ed2d 100644
--- a/OpenSim/Framework/UserAppearance.cs
+++ b/OpenSim/Framework/UserAppearance.cs
@@ -25,7 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using libsecondlife; 28using libsecondlife;
30 29
31namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index f8467b6..db9a864 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -28,8 +28,6 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Threading;
32
33using libsecondlife; 31using libsecondlife;
34using log4net; 32using log4net;
35using OpenSim.Framework; 33using OpenSim.Framework;
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index d824d21..50e06af 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -36,6 +36,7 @@ using log4net;
36using Nwc.XmlRpc; 36using Nwc.XmlRpc;
37using OpenSim.Data; 37using OpenSim.Data;
38using OpenSim.Framework; 38using OpenSim.Framework;
39
39//using System.Xml; 40//using System.Xml;
40 41
41namespace OpenSim.Grid.MessagingServer 42namespace OpenSim.Grid.MessagingServer
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index cad0380..e89db3d 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -26,21 +26,17 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.IO; 30using System.IO;
32using System.Net;
33using System.Reflection; 31using System.Reflection;
34using System.Text; 32using System.Text;
35using System.Threading; 33using System.Threading;
36using System.Timers;
37using libsecondlife; 34using libsecondlife;
38using log4net; 35using log4net;
39using Mono.Addins; 36using Mono.Addins;
40using Nini.Config; 37using Nini.Config;
41using OpenSim.Framework; 38using OpenSim.Framework;
42using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
43using OpenSim.Framework.Console;
44using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
45using OpenSim.Framework.Statistics; 41using OpenSim.Framework.Statistics;
46using OpenSim.Region.ClientStack; 42using OpenSim.Region.ClientStack;
@@ -50,7 +46,6 @@ using OpenSim.Region.Environment;
50using OpenSim.Region.Environment.Interfaces; 46using OpenSim.Region.Environment.Interfaces;
51using OpenSim.Region.Environment.Scenes; 47using OpenSim.Region.Environment.Scenes;
52using OpenSim.Region.Physics.Manager; 48using OpenSim.Region.Physics.Manager;
53using Timer=System.Timers.Timer;
54 49
55namespace OpenSim 50namespace OpenSim
56{ 51{
diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs
index 53e3583..ac5a1ec 100644
--- a/OpenSim/Region/Application/OpenSimMainConsole.cs
+++ b/OpenSim/Region/Application/OpenSimMainConsole.cs
@@ -26,33 +26,23 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
29using System.Collections.Generic; 30using System.Collections.Generic;
30using System.Diagnostics;
31using System.IO; 31using System.IO;
32using System.Text; 32using System.Net;
33using System.Reflection;
33using System.Threading; 34using System.Threading;
34using System.Timers; 35using System.Timers;
36using libsecondlife;
37using log4net;
35using Nini.Config; 38using Nini.Config;
36using OpenSim.Framework; 39using OpenSim.Framework;
37using OpenSim.Framework.Communications.Cache;
38using OpenSim.Framework.Console; 40using OpenSim.Framework.Console;
39using OpenSim.Framework.Servers;
40using OpenSim.Framework.Statistics; 41using OpenSim.Framework.Statistics;
41using OpenSim.Region.ClientStack; 42using OpenSim.Region.ClientStack;
42using OpenSim.Region.Communications.Local;
43using OpenSim.Region.Communications.OGS1;
44using OpenSim.Region.Environment;
45using OpenSim.Region.Environment.Interfaces; 43using OpenSim.Region.Environment.Interfaces;
46using OpenSim.Region.Environment.Scenes; 44using OpenSim.Region.Environment.Scenes;
47using OpenSim.Region.Physics.Manager;
48using Timer=System.Timers.Timer; 45using Timer=System.Timers.Timer;
49using System.Net;
50using Nwc.XmlRpc;
51using System.Collections;
52using System.Reflection;
53using libsecondlife;
54using Mono.Addins;
55using Mono.Addins.Description;
56 46
57namespace OpenSim 47namespace OpenSim
58{ 48{
@@ -60,7 +50,7 @@ namespace OpenSim
60 50
61 public class OpenSimMainConsole : OpenSimMain, conscmd_callback 51 public class OpenSimMainConsole : OpenSimMain, conscmd_callback
62 { 52 {
63 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 53 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
64 54
65 protected string m_startupCommandsFile; 55 protected string m_startupCommandsFile;
66 protected string m_shutdownCommandsFile; 56 protected string m_shutdownCommandsFile;
@@ -243,7 +233,7 @@ namespace OpenSim
243 } 233 }
244 else 234 else
245 { 235 {
246 m_sceneManager.CurrentScene.SetSceneCoreDebug(!System.Convert.ToBoolean(cmdparams[0]), !System.Convert.ToBoolean(cmdparams[1]), !System.Convert.ToBoolean(cmdparams[2])); 236 m_sceneManager.CurrentScene.SetSceneCoreDebug(!Convert.ToBoolean(cmdparams[0]), !Convert.ToBoolean(cmdparams[1]), !Convert.ToBoolean(cmdparams[2]));
247 } 237 }
248 } 238 }
249 else 239 else
@@ -300,7 +290,7 @@ namespace OpenSim
300// m_console.Notice("THREAD", _tc + ": ID: " + pt.Id + ", Started: " + pt.StartTime.ToString() + ", CPU time: " + pt.TotalProcessorTime + ", Pri: " + pt.BasePriority.ToString() + ", State: " + pt.ThreadState.ToString()); 290// m_console.Notice("THREAD", _tc + ": ID: " + pt.Id + ", Started: " + pt.StartTime.ToString() + ", CPU time: " + pt.TotalProcessorTime + ", Pri: " + pt.BasePriority.ToString() + ", State: " + pt.ThreadState.ToString());
301// } 291// }
302 292
303 List<Thread> threads = OpenSim.Framework.ThreadTracker.GetThreads(); 293 List<Thread> threads = ThreadTracker.GetThreads();
304 if (threads == null) 294 if (threads == null)
305 { 295 {
306 m_console.Notice("THREAD", "Thread tracking is only enabled in DEBUG mode."); 296 m_console.Notice("THREAD", "Thread tracking is only enabled in DEBUG mode.");
@@ -546,7 +536,7 @@ namespace OpenSim
546 case "unload": 536 case "unload":
547 if (cmdparams.Length > 1) 537 if (cmdparams.Length > 1)
548 { 538 {
549 foreach (IRegionModule rm in new System.Collections.ArrayList(m_moduleLoader.GetLoadedSharedModules)) 539 foreach (IRegionModule rm in new ArrayList(m_moduleLoader.GetLoadedSharedModules))
550 { 540 {
551 if (rm.Name.ToLower() == cmdparams[1].ToLower()) 541 if (rm.Name.ToLower() == cmdparams[1].ToLower())
552 { 542 {
@@ -559,7 +549,7 @@ namespace OpenSim
559 case "load": 549 case "load":
560 if (cmdparams.Length > 1) 550 if (cmdparams.Length > 1)
561 { 551 {
562 foreach (Scene s in new System.Collections.ArrayList(m_sceneManager.Scenes)) 552 foreach (Scene s in new ArrayList(m_sceneManager.Scenes))
563 { 553 {
564 554
565 m_console.Notice("Loading module: " + cmdparams[1]); 555 m_console.Notice("Loading module: " + cmdparams[1]);
@@ -632,7 +622,7 @@ namespace OpenSim
632 { 622 {
633 RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle); 623 RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle);
634 string regionName; 624 string regionName;
635 System.Net.EndPoint ep = null; 625 EndPoint ep = null;
636 626
637 if (regionInfo == null) 627 if (regionInfo == null)
638 { 628 {
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index d3f6f20..3643088 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -33,11 +33,11 @@ using log4net;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36//using OpenSim.Framework.Console;
37using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
38using OpenSim.Region.Environment; 37using OpenSim.Region.Environment;
39using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
40using OpenSim.Region.Physics.Manager; 39using OpenSim.Region.Physics.Manager;
40//using OpenSim.Framework.Console;
41 41
42namespace OpenSim.Region.ClientStack 42namespace OpenSim.Region.ClientStack
43{ 43{
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index b1816d0..8a35519 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -237,7 +237,7 @@ namespace OpenSim.Region.Communications.OGS1
237 SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>( 237 SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
238 "POST", _inventoryServerUrl + "/NewItem/", item); 238 "POST", _inventoryServerUrl + "/NewItem/", item);
239 } 239 }
240 catch (System.Net.WebException e) 240 catch (WebException e)
241 { 241 {
242 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Update new inventory item operation failed, {0} {1}", 242 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Update new inventory item operation failed, {0} {1}",
243 e.Source, e.Message); 243 e.Source, e.Message);
diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs
index b34e126..e0ea94f 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Environment/ModuleLoader.cs
@@ -32,7 +32,6 @@ using System.Reflection;
32using log4net; 32using log4net;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
35//TODO: Why do we reference InstantMessageModule here?
36using OpenSim.Region.Environment.Modules.Agent.AssetTransaction; 35using OpenSim.Region.Environment.Modules.Agent.AssetTransaction;
37using OpenSim.Region.Environment.Modules.Avatar.Chat; 36using OpenSim.Region.Environment.Modules.Avatar.Chat;
38using OpenSim.Region.Environment.Modules.Avatar.InstantMessage; 37using OpenSim.Region.Environment.Modules.Avatar.InstantMessage;
@@ -40,6 +39,7 @@ using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture;
40using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL; 39using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL;
41using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; 40using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
42using OpenSim.Region.Environment.Scenes; 41using OpenSim.Region.Environment.Scenes;
42//TODO: Why do we reference InstantMessageModule here?
43 43
44namespace OpenSim.Region.Environment 44namespace OpenSim.Region.Environment
45{ 45{
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 27967bc..91bbdb7 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -29,6 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Reflection; 31using System.Reflection;
32using System.Threading;
32using libsecondlife; 33using libsecondlife;
33using log4net; 34using log4net;
34using OpenSim.Framework; 35using OpenSim.Framework;
@@ -580,7 +581,7 @@ namespace OpenSim.Region.Environment.Scenes
580 avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), 581 avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4),
581 capsPath); 582 capsPath);
582 avatar.MakeChildAgent(); 583 avatar.MakeChildAgent();
583 System.Threading.Thread.Sleep(5000); 584 Thread.Sleep(5000);
584 avatar.CrossAttachmentsIntoNewRegion(regionHandle); 585 avatar.CrossAttachmentsIntoNewRegion(regionHandle);
585 if (KillObject != null) 586 if (KillObject != null)
586 { 587 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 5164d30..e53cfaa 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -30,7 +30,6 @@ using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.IO; 31using System.IO;
32using System.Xml; 32using System.Xml;
33using System.Xml.Serialization;
34using Axiom.Math; 33using Axiom.Math;
35using libsecondlife; 34using libsecondlife;
36using libsecondlife.Packets; 35using libsecondlife.Packets;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 5f91176..18cae48 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.Drawing; 30using System.Drawing;
32using System.Runtime.Serialization; 31using System.Runtime.Serialization;
diff --git a/OpenSim/Region/Environment/Scenes/UndoState.cs b/OpenSim/Region/Environment/Scenes/UndoState.cs
index 65c8669..daabd8d 100644
--- a/OpenSim/Region/Environment/Scenes/UndoState.cs
+++ b/OpenSim/Region/Environment/Scenes/UndoState.cs
@@ -25,8 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using libsecondlife; 28using libsecondlife;
31 29
32namespace OpenSim.Region.Environment.Scenes 30namespace OpenSim.Region.Environment.Scenes
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 0773253..31ca3f3 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -3074,7 +3074,7 @@ namespace OpenSim.Region.ScriptEngine.Common
3074 { 3074 {
3075 return Convert.ToInt32(src.Data[index]); 3075 return Convert.ToInt32(src.Data[index]);
3076 } 3076 }
3077 catch (System.FormatException e) 3077 catch (FormatException e)
3078 { 3078 {
3079 return 0; 3079 return 0;
3080 } 3080 }
@@ -3109,7 +3109,7 @@ namespace OpenSim.Region.ScriptEngine.Common
3109 { 3109 {
3110 return Convert.ToDouble(src.Data[index]); 3110 return Convert.ToDouble(src.Data[index]);
3111 } 3111 }
3112 catch (System.FormatException e) 3112 catch (FormatException e)
3113 { 3113 {
3114 return 0.0; 3114 return 0.0;
3115 } 3115 }
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
index 261f862..77a4048 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
@@ -28,7 +28,6 @@
28using System; 28using System;
29using libsecondlife; 29using libsecondlife;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment;
32using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; 31using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney;
33using OpenSim.Region.Environment.Scenes; 32using OpenSim.Region.Environment.Scenes;
34 33
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
index 458bd4c..3e9fc65 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
@@ -27,7 +27,9 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Reflection;
30using System.Threading; 31using System.Threading;
32using log4net;
31using OpenSim.Framework; 33using OpenSim.Framework;
32 34
33namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase 35namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
@@ -38,7 +40,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
38 public class MaintenanceThread : iScriptEngineFunctionModule 40 public class MaintenanceThread : iScriptEngineFunctionModule
39 { 41 {
40 42
41 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 44
43 //public ScriptEngine m_ScriptEngine; 45 //public ScriptEngine m_ScriptEngine;
44 private int MaintenanceLoopms; 46 private int MaintenanceLoopms;
@@ -216,7 +218,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
216 //} 218 //}
217 } 219 }
218 } 220 }
219 catch(System.Threading.ThreadAbortException ex) 221 catch(ThreadAbortException ex)
220 { 222 {
221 m_log.Error("Thread aborted in MaintenanceLoopThread. If this is during shutdown, please ignore"); 223 m_log.Error("Thread aborted in MaintenanceLoopThread. If this is during shutdown, please ignore");
222 } 224 }