aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneBase.cs
diff options
context:
space:
mode:
authorAdam Frisby2008-05-01 16:35:00 +0000
committerAdam Frisby2008-05-01 16:35:00 +0000
commit13526097f24b7a8ad63b1d482c44b44397fa055f (patch)
tree7a82c20ed7c63e2aea5ad3863325e37f64e1cbea /OpenSim/Region/Environment/Scenes/SceneBase.cs
parent* Breaking all the code, breaking all the code..! (diff)
downloadopensim-SC_OLD-13526097f24b7a8ad63b1d482c44b44397fa055f.zip
opensim-SC_OLD-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.gz
opensim-SC_OLD-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.bz2
opensim-SC_OLD-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.xz
* Spring cleaning on Region.Environment.
* Converted a large number of read-only fields to be actually, readonly. * Reformatted code sections. * Removed redundant code.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneBase.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneBase.cs71
1 files changed, 37 insertions, 34 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index d9dc1da..435dc8b 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -40,6 +40,11 @@ namespace OpenSim.Region.Environment.Scenes
40 { 40 {
41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 42
43 /// <summary>
44 /// XXX These two methods are very temporary
45 /// </summary>
46 protected Dictionary<LLUUID, string> capsPaths = new Dictionary<LLUUID, string>();
47
43 #region Events 48 #region Events
44 49
45 public event restart OnRestart; 50 public event restart OnRestart;
@@ -50,41 +55,38 @@ namespace OpenSim.Region.Environment.Scenes
50 55
51 private readonly ClientManager m_clientManager = new ClientManager(); 56 private readonly ClientManager m_clientManager = new ClientManager();
52 57
53 public ClientManager ClientManager
54 {
55 get { return m_clientManager; }
56 }
57
58 protected ulong m_regionHandle;
59 protected string m_regionName;
60 protected RegionInfo m_regInfo;
61
62 //public TerrainEngine Terrain; 58 //public TerrainEngine Terrain;
63 public ITerrainChannel Heightmap; 59 public ITerrainChannel Heightmap;
64 60
65 public ILandChannel LandChannel; 61 public ILandChannel LandChannel;
62 private AssetCache m_assetCache;
66 63
64
65 protected string m_datastore;
67 protected EventManager m_eventManager; 66 protected EventManager m_eventManager;
68 67
68 private uint m_nextLocalId = 8880000;
69 protected RegionInfo m_regInfo;
70 protected ulong m_regionHandle;
71 protected string m_regionName;
72
73 protected RegionStatus m_regStatus;
74
69 public EventManager EventManager 75 public EventManager EventManager
70 { 76 {
71 get { return m_eventManager; } 77 get { return m_eventManager; }
72 } 78 }
73 79
74
75 protected string m_datastore;
76
77 private uint m_nextLocalId = 8880000;
78
79 private AssetCache m_assetCache;
80
81 public AssetCache AssetCache 80 public AssetCache AssetCache
82 { 81 {
83 get { return m_assetCache; } 82 get { return m_assetCache; }
84 set { m_assetCache = value; } 83 set { m_assetCache = value; }
85 } 84 }
86 85
87 protected RegionStatus m_regStatus; 86 public ClientManager ClientManager
87 {
88 get { return m_clientManager; }
89 }
88 90
89 public RegionStatus Region_Status 91 public RegionStatus Region_Status
90 { 92 {
@@ -141,6 +143,8 @@ namespace OpenSim.Region.Environment.Scenes
141 143
142 #endregion 144 #endregion
143 145
146 #region IScene Members
147
144 /// <summary> 148 /// <summary>
145 /// 149 ///
146 /// </summary> 150 /// </summary>
@@ -155,6 +159,18 @@ namespace OpenSim.Region.Environment.Scenes
155 get { return m_nextLocalId++; } 159 get { return m_nextLocalId++; }
156 } 160 }
157 161
162 public string GetCapsPath(LLUUID agentId)
163 {
164 if (capsPaths.ContainsKey(agentId))
165 {
166 return capsPaths[agentId];
167 }
168
169 return null;
170 }
171
172 #endregion
173
158 #region admin stuff 174 #region admin stuff
159 175
160 /// <summary> 176 /// <summary>
@@ -173,6 +189,7 @@ namespace OpenSim.Region.Environment.Scenes
173 { 189 {
174 return false; 190 return false;
175 } 191 }
192
176 public abstract bool OtherRegionUp(RegionInfo thisRegion); 193 public abstract bool OtherRegionUp(RegionInfo thisRegion);
177 194
178 public virtual string GetSimulatorVersion() 195 public virtual string GetSimulatorVersion()
@@ -195,24 +212,10 @@ namespace OpenSim.Region.Environment.Scenes
195 } 212 }
196 catch (Exception e) 213 catch (Exception e)
197 { 214 {
198 m_log.Error("[SCENE]: SceneBase.cs: Close() - Failed with exception " + e.ToString()); 215 m_log.Error("[SCENE]: SceneBase.cs: Close() - Failed with exception " + e);
199 } 216 }
200 } 217 }
201 218
202 #endregion 219 #endregion
203
204 /// <summary>
205 /// XXX These two methods are very temporary
206 /// </summary>
207 protected Dictionary<LLUUID, string> capsPaths = new Dictionary<LLUUID, string>();
208 public string GetCapsPath(LLUUID agentId)
209 {
210 if (capsPaths.ContainsKey(agentId))
211 {
212 return capsPaths[agentId];
213 }
214
215 return null;
216 }
217 } 220 }
218} 221} \ No newline at end of file