aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs9
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;
39using OpenSim.Framework.Types; 39using OpenSim.Framework.Types;
40using OpenSim.Framework.Configuration; 40using OpenSim.Framework.Configuration;
41using OpenSim.Physics.Manager; 41using OpenSim.Physics.Manager;
42using OpenSim.Region.Caches; 42
43using OpenSim.Region.ClientStack; 43using OpenSim.Region.ClientStack;
44using OpenSim.Region.Communications.Local; 44using OpenSim.Region.Communications.Local;
45using OpenSim.Region.Communications.OGS1; 45using OpenSim.Region.Communications.OGS1;
46using OpenSim.Framework.Communications.Caches;
46using OpenSim.Region.Environment.Scenes; 47using OpenSim.Region.Environment.Scenes;
47using OpenSim.Region.Environment; 48using OpenSim.Region.Environment;
48using System.Text; 49using System.Text;
49using System.Collections.Generic; 50using System.Collections.Generic;
51using OpenSim.Framework.Utilities;
50 52
51namespace OpenSim 53namespace 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)