diff options
* Optimized usings (the 'LL ate my scripts' commit)
* added some licensing info
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneBase.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneBase.cs | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index 817f206..4036743 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs | |||
@@ -26,25 +26,20 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | 28 | using System; |
29 | using libsecondlife; | ||
30 | using libsecondlife.Packets; | ||
31 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
32 | using System.Text; | ||
33 | using System.Reflection; | 30 | using System.Reflection; |
34 | using System.IO; | 31 | using libsecondlife; |
35 | using System.Threading; | 32 | using OpenSim.Framework.Console; |
36 | using OpenSim.Physics.Manager; | ||
37 | using OpenSim.Framework.Interfaces; | 33 | using OpenSim.Framework.Interfaces; |
38 | using OpenSim.Framework.Types; | 34 | using OpenSim.Framework.Types; |
39 | using OpenSim.Framework.Inventory; | ||
40 | using OpenSim.Region.Terrain; | ||
41 | using OpenSim.Region.Caches; | 35 | using OpenSim.Region.Caches; |
36 | using OpenSim.Region.Terrain; | ||
42 | 37 | ||
43 | namespace OpenSim.Region.Environment.Scenes | 38 | namespace OpenSim.Region.Environment.Scenes |
44 | { | 39 | { |
45 | public abstract class SceneBase : IWorld | 40 | public abstract class SceneBase : IWorld |
46 | { | 41 | { |
47 | public Dictionary<libsecondlife.LLUUID, EntityBase> Entities; | 42 | public Dictionary<LLUUID, EntityBase> Entities; |
48 | protected Dictionary<uint, IClientAPI> m_clientThreads; | 43 | protected Dictionary<uint, IClientAPI> m_clientThreads; |
49 | protected ulong m_regionHandle; | 44 | protected ulong m_regionHandle; |
50 | protected string m_regionName; | 45 | protected string m_regionName; |
@@ -113,7 +108,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
113 | } | 108 | } |
114 | catch (Exception e) | 109 | catch (Exception e) |
115 | { | 110 | { |
116 | OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString()); | 111 | MainLog.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString()); |
117 | return false; | 112 | return false; |
118 | } | 113 | } |
119 | } | 114 | } |
@@ -191,7 +186,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
191 | } | 186 | } |
192 | catch (Exception e) | 187 | catch (Exception e) |
193 | { | 188 | { |
194 | OpenSim.Framework.Console.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString()); | 189 | MainLog.Instance.WriteLine(LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString()); |
195 | } | 190 | } |
196 | } | 191 | } |
197 | 192 | ||