diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index f20b132..e9331e9 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -29,7 +29,6 @@ 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 libsecondlife; |
32 | using Nini.Config; | ||
33 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Communications; | 33 | using OpenSim.Framework.Communications; |
35 | using OpenSim.Framework.Communications.Cache; | 34 | using OpenSim.Framework.Communications.Cache; |
@@ -55,7 +54,7 @@ namespace OpenSim.Region.ClientStack | |||
55 | protected CommunicationsManager m_commsManager; | 54 | protected CommunicationsManager m_commsManager; |
56 | 55 | ||
57 | protected SceneManager m_sceneManager = new SceneManager(); | 56 | protected SceneManager m_sceneManager = new SceneManager(); |
58 | 57 | ||
59 | protected StorageManager m_storageManager; | 58 | protected StorageManager m_storageManager; |
60 | protected string m_storageConnectionString; | 59 | protected string m_storageConnectionString; |
61 | 60 | ||
@@ -73,7 +72,7 @@ namespace OpenSim.Region.ClientStack | |||
73 | { | 72 | { |
74 | ClientView.TerrainManager = new TerrainManager(new SecondLife()); | 73 | ClientView.TerrainManager = new TerrainManager(new SecondLife()); |
75 | 74 | ||
76 | m_storageManager = CreateStorageManager(m_storageConnectionString ); | 75 | m_storageManager = CreateStorageManager(m_storageConnectionString); |
77 | 76 | ||
78 | Initialize(); | 77 | Initialize(); |
79 | 78 | ||
@@ -142,7 +141,7 @@ namespace OpenSim.Region.ClientStack | |||
142 | m_log.Verbose("PARCEL", "No master avatar found, using null."); | 141 | m_log.Verbose("PARCEL", "No master avatar found, using null."); |
143 | scene.RegionInfo.MasterAvatarAssignedUUID = LLUUID.Zero; | 142 | scene.RegionInfo.MasterAvatarAssignedUUID = LLUUID.Zero; |
144 | } | 143 | } |
145 | 144 | ||
146 | scene.LoadPrimsFromStorage(m_permissions); | 145 | scene.LoadPrimsFromStorage(m_permissions); |
147 | scene.loadAllLandObjectsFromStorage(); | 146 | scene.loadAllLandObjectsFromStorage(); |
148 | scene.performParcelPrimCountUpdate(); | 147 | scene.performParcelPrimCountUpdate(); |
@@ -153,4 +152,4 @@ namespace OpenSim.Region.ClientStack | |||
153 | protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, | 152 | protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, |
154 | AgentCircuitManager circuitManager); | 153 | AgentCircuitManager circuitManager); |
155 | } | 154 | } |
156 | } | 155 | } \ No newline at end of file |