aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/RegionApplicationBase.cs
diff options
context:
space:
mode:
authorlbsa712007-10-30 09:05:31 +0000
committerlbsa712007-10-30 09:05:31 +0000
commit67e12b95ea7b68f4904a7484d77ecfd787d16d0c (patch)
tree20b00d24c8a7617017960432ec044852e3ad5fa9 /OpenSim/Region/ClientStack/RegionApplicationBase.cs
parent* Deleted .user file (diff)
downloadopensim-SC-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.zip
opensim-SC-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.gz
opensim-SC-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.bz2
opensim-SC-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.xz
* Optimized usings
* Shortened type references * Removed redundant 'this' qualifier
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs25
1 files changed, 12 insertions, 13 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 657af54..7551bff 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -28,17 +28,15 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using libsecondlife;
31using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications;
32using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
33using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
36using OpenSim.Framework;
37using OpenSim.Region.Physics.Manager;
38using OpenSim.Region.Environment; 37using OpenSim.Region.Environment;
39using libsecondlife;
40using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
41using OpenSim.Framework.Communications; 39using OpenSim.Region.Physics.Manager;
42 40
43namespace OpenSim.Region.ClientStack 41namespace OpenSim.Region.ClientStack
44{ 42{
@@ -67,9 +65,8 @@ namespace OpenSim.Region.ClientStack
67 m_startuptime = DateTime.Now; 65 m_startuptime = DateTime.Now;
68 } 66 }
69 67
70 virtual public void StartUp() 68 public virtual void StartUp()
71 { 69 {
72
73 ClientView.TerrainManager = new TerrainManager(new SecondLife()); 70 ClientView.TerrainManager = new TerrainManager(new SecondLife());
74 71
75 Initialize(); 72 Initialize();
@@ -116,7 +113,10 @@ namespace OpenSim.Region.ClientStack
116 scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D()); 113 scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D());
117 114
118 //Master Avatar Setup 115 //Master Avatar Setup
119 UserProfileData masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName, scene.RegionInfo.MasterAvatarSandboxPassword); 116 UserProfileData masterAvatar =
117 m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName,
118 scene.RegionInfo.MasterAvatarLastName,
119 scene.RegionInfo.MasterAvatarSandboxPassword);
120 if (masterAvatar != null) 120 if (masterAvatar != null)
121 { 121 {
122 m_log.Verbose("PARCEL", "Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]"); 122 m_log.Verbose("PARCEL", "Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]");
@@ -126,7 +126,7 @@ namespace OpenSim.Region.ClientStack
126 else 126 else
127 { 127 {
128 m_log.Verbose("PARCEL", "No master avatar found, using null."); 128 m_log.Verbose("PARCEL", "No master avatar found, using null.");
129 scene.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero; 129 scene.RegionInfo.MasterAvatarAssignedUUID = LLUUID.Zero;
130 //TODO: Load parcels from storageManager 130 //TODO: Load parcels from storageManager
131 } 131 }
132 132
@@ -138,8 +138,7 @@ namespace OpenSim.Region.ClientStack
138 return scene; 138 return scene;
139 } 139 }
140 140
141 protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, AgentCircuitManager circuitManager); 141 protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
142 142 AgentCircuitManager circuitManager);
143
144 } 143 }
145} 144} \ No newline at end of file