diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 25 |
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 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Net; | 30 | using System.Net; |
31 | using libsecondlife; | ||
31 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Communications; | ||
32 | using OpenSim.Framework.Communications.Cache; | 34 | using OpenSim.Framework.Communications.Cache; |
33 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
34 | using OpenSim.Framework.Interfaces; | ||
35 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
36 | using OpenSim.Framework; | ||
37 | using OpenSim.Region.Physics.Manager; | ||
38 | using OpenSim.Region.Environment; | 37 | using OpenSim.Region.Environment; |
39 | using libsecondlife; | ||
40 | using OpenSim.Region.Environment.Scenes; | 38 | using OpenSim.Region.Environment.Scenes; |
41 | using OpenSim.Framework.Communications; | 39 | using OpenSim.Region.Physics.Manager; |
42 | 40 | ||
43 | namespace OpenSim.Region.ClientStack | 41 | namespace 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 |