diff options
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 6b7026c..d961b73 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -39,14 +39,16 @@ using OpenSim.Framework.Servers; | |||
39 | using OpenSim.Framework.Types; | 39 | using OpenSim.Framework.Types; |
40 | using OpenSim.Framework.Configuration; | 40 | using OpenSim.Framework.Configuration; |
41 | using OpenSim.Physics.Manager; | 41 | using OpenSim.Physics.Manager; |
42 | using OpenSim.Region.Caches; | 42 | |
43 | using OpenSim.Region.ClientStack; | 43 | using OpenSim.Region.ClientStack; |
44 | using OpenSim.Region.Communications.Local; | 44 | using OpenSim.Region.Communications.Local; |
45 | using OpenSim.Region.Communications.OGS1; | 45 | using OpenSim.Region.Communications.OGS1; |
46 | using OpenSim.Framework.Communications.Caches; | ||
46 | using OpenSim.Region.Environment.Scenes; | 47 | using OpenSim.Region.Environment.Scenes; |
47 | using OpenSim.Region.Environment; | 48 | using OpenSim.Region.Environment; |
48 | using System.Text; | 49 | using System.Text; |
49 | using System.Collections.Generic; | 50 | using System.Collections.Generic; |
51 | using OpenSim.Framework.Utilities; | ||
50 | 52 | ||
51 | namespace OpenSim | 53 | namespace OpenSim |
52 | { | 54 | { |
@@ -97,11 +99,11 @@ namespace OpenSim | |||
97 | 99 | ||
98 | if (m_sandbox) | 100 | if (m_sandbox) |
99 | { | 101 | { |
100 | m_commsManager = new CommunicationsLocal( m_networkServersInfo, m_httpServer); | 102 | m_commsManager = new CommunicationsLocal( m_networkServersInfo, m_httpServer, m_assetCache); |
101 | } | 103 | } |
102 | else | 104 | else |
103 | { | 105 | { |
104 | m_commsManager = new CommunicationsOGS1( m_networkServersInfo, m_httpServer ); | 106 | m_commsManager = new CommunicationsOGS1( m_networkServersInfo, m_httpServer , m_assetCache); |
105 | } | 107 | } |
106 | 108 | ||
107 | string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Regions"); | 109 | string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Regions"); |
@@ -137,6 +139,7 @@ namespace OpenSim | |||
137 | this.m_udpServers[i].ServerListener(); | 139 | this.m_udpServers[i].ServerListener(); |
138 | } | 140 | } |
139 | 141 | ||
142 | |||
140 | } | 143 | } |
141 | 144 | ||
142 | protected override StorageManager CreateStorageManager(RegionInfo regionInfo) | 145 | protected override StorageManager CreateStorageManager(RegionInfo regionInfo) |