aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneBase.cs
diff options
context:
space:
mode:
authorlbsa712007-07-03 14:37:29 +0000
committerlbsa712007-07-03 14:37:29 +0000
commit9b6b6d05d45cf0f754a0b26bf6240ef50be66563 (patch)
tree8d72120aac2184c5ed4c5ab5f6b673ef496a0803 /OpenSim/Region/Environment/Scenes/SceneBase.cs
parent* Completed conceptual LlsdMethod - everything resides in SimpleApp pending g... (diff)
downloadopensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.zip
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.gz
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.bz2
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.xz
* 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.cs17
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*/
28using System; 28using System;
29using libsecondlife;
30using libsecondlife.Packets;
31using System.Collections.Generic; 29using System.Collections.Generic;
32using System.Text;
33using System.Reflection; 30using System.Reflection;
34using System.IO; 31using libsecondlife;
35using System.Threading; 32using OpenSim.Framework.Console;
36using OpenSim.Physics.Manager;
37using OpenSim.Framework.Interfaces; 33using OpenSim.Framework.Interfaces;
38using OpenSim.Framework.Types; 34using OpenSim.Framework.Types;
39using OpenSim.Framework.Inventory;
40using OpenSim.Region.Terrain;
41using OpenSim.Region.Caches; 35using OpenSim.Region.Caches;
36using OpenSim.Region.Terrain;
42 37
43namespace OpenSim.Region.Environment.Scenes 38namespace 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