aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs104
-rw-r--r--OpenSim/Region/ClientStack/PacketServer.cs4
-rw-r--r--OpenSim/Region/Environment/PermissionManager.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs12
5 files changed, 16 insertions, 112 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 28d0477..cf3ed85 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -110,6 +110,7 @@ namespace OpenSim
110 { 110 {
111 Directory.CreateDirectory(Util.logDir()); 111 Directory.CreateDirectory(Util.logDir());
112 } 112 }
113
113 m_log = new LogBase(Path.Combine(Util.logDir(), m_logFilename), "Region", this, m_silent); 114 m_log = new LogBase(Path.Combine(Util.logDir(), m_logFilename), "Region", this, m_silent);
114 MainLog.Instance = m_log; 115 MainLog.Instance = m_log;
115 116
@@ -226,107 +227,6 @@ namespace OpenSim
226 } 227 }
227 228
228 #endregion 229 #endregion
229
230 /*private void SetupFromConfigFile(IGenericConfig configData)
231 {
232 // Log filename
233 string attri = "";
234 attri = configData.GetAttribute("LogFilename");
235 if (String.IsNullOrEmpty(attri))
236 {
237 }
238 else
239 {
240 m_logFilename = attri;
241 }
242
243 // SandBoxMode
244 attri = "";
245 attri = configData.GetAttribute("SandBox");
246 if ((attri == "") || ((attri != "false") && (attri != "true")))
247 {
248 this.m_sandbox = false;
249 configData.SetAttribute("SandBox", "false");
250 }
251 else
252 {
253 this.m_sandbox = Convert.ToBoolean(attri);
254 }
255
256 // LoginServer
257 attri = "";
258 attri = configData.GetAttribute("LoginServer");
259 if ((attri == "") || ((attri != "false") && (attri != "true")))
260 {
261 this.m_loginserver = false;
262 configData.SetAttribute("LoginServer", "false");
263 }
264 else
265 {
266 this.m_loginserver = Convert.ToBoolean(attri);
267 }
268
269 // Sandbox User accounts
270 attri = "";
271 attri = configData.GetAttribute("UserAccount");
272 if ((attri == "") || ((attri != "false") && (attri != "true")))
273 {
274 this.user_accounts = false;
275 configData.SetAttribute("UserAccounts", "false");
276 }
277 else if (attri == "true")
278 {
279 this.user_accounts = Convert.ToBoolean(attri);
280 }
281
282 // Grid mode hack to use local asset server
283 attri = "";
284 attri = configData.GetAttribute("LocalAssets");
285 if ((attri == "") || ((attri != "false") && (attri != "true")))
286 {
287 this.m_gridLocalAsset = false;
288 configData.SetAttribute("LocalAssets", "false");
289 }
290 else if (attri == "true")
291 {
292 this.m_gridLocalAsset = Convert.ToBoolean(attri);
293 }
294
295
296 attri = "";
297 attri = configData.GetAttribute("PhysicsEngine");
298 switch (attri)
299 {
300 default:
301 throw new ArgumentException(String.Format( "Invalid value [{0}] for PhysicsEngine attribute, terminating", attri ) );
302
303 case "":
304 case "basicphysics":
305 this.m_physicsEngine = "basicphysics";
306 configData.SetAttribute("PhysicsEngine", "basicphysics");
307 ScenePresence.PhysicsEngineFlying = false;
308 break;
309
310 case "RealPhysX":
311 this.m_physicsEngine = "RealPhysX";
312 ScenePresence.PhysicsEngineFlying = true;
313 break;
314
315 case "OpenDynamicsEngine":
316 this.m_physicsEngine = "OpenDynamicsEngine";
317 ScenePresence.PhysicsEngineFlying = true;
318 break;
319
320 case "BulletXEngine":
321 this.m_physicsEngine = "BulletXEngine";
322 ScenePresence.PhysicsEngineFlying = true;
323 break;
324 }
325
326 configData.Commit();
327
328 }*/
329
330 /// <summary> 230 /// <summary>
331 /// Performs any last-minute sanity checking and shuts down the region server 231 /// Performs any last-minute sanity checking and shuts down the region server
332 /// </summary> 232 /// </summary>
@@ -339,7 +239,7 @@ namespace OpenSim
339 m_log.Verbose("Closing console and terminating"); 239 m_log.Verbose("Closing console and terminating");
340 for (int i = 0; i < m_localScenes.Count; i++) 240 for (int i = 0; i < m_localScenes.Count; i++)
341 { 241 {
342 ((Scene)m_localScenes[i]).Close(); 242 m_localScenes[i].Close();
343 } 243 }
344 m_log.Close(); 244 m_log.Close();
345 Environment.Exit(0); 245 Environment.Exit(0);
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index 9d2250e..24bcfb1 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -122,9 +122,9 @@ namespace OpenSim.Region.ClientStack
122 122
123 } 123 }
124 124
125 protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IScene world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AgentCircuitManager authenSessions) 125 protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IScene scene, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AgentCircuitManager authenSessions)
126 { 126 {
127 return new ClientView(remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions ); 127 return new ClientView(remoteEP, initialcirpack, clientThreads, scene, assetCache, packServer, inventoryCache, authenSessions );
128 } 128 }
129 129
130 /// <summary> 130 /// <summary>
diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs
index ea93050..150a8ed 100644
--- a/OpenSim/Region/Environment/PermissionManager.cs
+++ b/OpenSim/Region/Environment/PermissionManager.cs
@@ -15,9 +15,9 @@ namespace OpenSim.Region.Environment
15 { 15 {
16 protected Scene m_scene; 16 protected Scene m_scene;
17 17
18 public PermissionManager(Scene world) 18 public PermissionManager(Scene scene)
19 { 19 {
20 m_scene = world; 20 m_scene = scene;
21 } 21 }
22 22
23 public delegate void OnPermissionErrorDelegate(LLUUID user, string reason); 23 public delegate void OnPermissionErrorDelegate(LLUUID user, string reason);
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
index 3eb34b4..84e8120 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
@@ -57,10 +57,10 @@ namespace OpenSim.Region.Environment.Scenes
57 /// <summary> 57 /// <summary>
58 /// 58 ///
59 /// </summary> 59 /// </summary>
60 public AllNewSceneObjectGroup2(Scene world, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape) 60 public AllNewSceneObjectGroup2(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape)
61 { 61 {
62 m_regionHandle = regionHandle; 62 m_regionHandle = regionHandle;
63 m_scene = world; 63 m_scene = scene;
64 64
65 this.Pos = pos; 65 this.Pos = pos;
66 LLVector3 rootOffset = new LLVector3(0, 0, 0); 66 LLVector3 rootOffset = new LLVector3(0, 0, 0);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 4a57d13..203f831 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Scenes
115 #region Constructors 115 #region Constructors
116 116
117 /// <summary> 117 /// <summary>
118 /// Creates a new World class, and a region to go with it. 118 /// Creates a new Scene class, and a region to go with it.
119 /// </summary> 119 /// </summary>
120 /// <param name="clientThreads">Dictionary to contain client threads</param> 120 /// <param name="clientThreads">Dictionary to contain client threads</param>
121 /// <param name="regionHandle">Region Handle for this region</param> 121 /// <param name="regionHandle">Region Handle for this region</param>
@@ -198,7 +198,7 @@ namespace OpenSim.Region.Environment.Scenes
198 } 198 }
199 199
200 /// <summary> 200 /// <summary>
201 /// Performs per-frame updates on the scene, this should be the central world loop 201 /// Performs per-frame updates on the scene, this should be the central scene loop
202 /// </summary> 202 /// </summary>
203 public override void Update() 203 public override void Update()
204 { 204 {
@@ -232,7 +232,7 @@ namespace OpenSim.Region.Environment.Scenes
232 // General purpose event manager 232 // General purpose event manager
233 m_eventManager.TriggerOnFrame(); 233 m_eventManager.TriggerOnFrame();
234 234
235 //backup world data 235 //backup scene data
236 storageCount++; 236 storageCount++;
237 if (storageCount > 1200) //set to how often you want to backup 237 if (storageCount > 1200) //set to how often you want to backup
238 { 238 {
@@ -293,9 +293,13 @@ namespace OpenSim.Region.Environment.Scenes
293 } 293 }
294 } 294 }
295 } 295 }
296 catch (NotImplementedException)
297 {
298 throw;
299 }
296 catch (Exception e) 300 catch (Exception e)
297 { 301 {
298 MainLog.Instance.Warn("scene", "World.cs: Update() - Failed with exception " + e.ToString()); 302 MainLog.Instance.Error("Scene", "Update() - Failed with exception " + e.ToString());
299 } 303 }
300 updateLock.ReleaseMutex(); 304 updateLock.ReleaseMutex();
301 } 305 }