aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs18
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs8
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs7
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs10
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs1
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs7
8 files changed, 16 insertions, 39 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 629fed6..6ea04cf 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -416,14 +416,7 @@ namespace OpenSim
416 416
417 private void HandleClearAssets(string module, string[] args) 417 private void HandleClearAssets(string module, string[] args)
418 { 418 {
419 if (AssetCache != null) 419 m_log.Info("Not implemented.");
420 {
421 AssetCache.Clear();
422 }
423 else
424 {
425 m_log.Info("Asset cache is not configured.");
426 }
427 } 420 }
428 421
429 private void HandleForceUpdate(string module, string[] args) 422 private void HandleForceUpdate(string module, string[] args)
@@ -815,14 +808,7 @@ namespace OpenSim
815 switch (showParams[0]) 808 switch (showParams[0])
816 { 809 {
817 case "assets": 810 case "assets":
818 if (AssetCache != null) 811 m_log.Info("Not implemented.");
819 {
820 AssetCache.ShowState();
821 }
822 else
823 {
824 m_log.Info("Asset cache is not configured.");
825 }
826 break; 812 break;
827 813
828 case "users": 814 case "users":
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index d8f786b..3d58839 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -488,7 +488,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
488 /// Constructor 488 /// Constructor
489 /// </summary> 489 /// </summary>
490 public LLClientView( 490 public LLClientView(
491 EndPoint remoteEP, IScene scene, IAssetCache assetCache, LLPacketServer packServer, 491 EndPoint remoteEP, IScene scene, LLPacketServer packServer,
492 AuthenticateResponse sessionInfo, UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP, 492 AuthenticateResponse sessionInfo, UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP,
493 ClientStackUserSettings userSettings) 493 ClientStackUserSettings userSettings)
494 { 494 {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
index b154144..56219d1 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
@@ -87,13 +87,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
87 /// <param name="proxyEP"></param> 87 /// <param name="proxyEP"></param>
88 /// <returns></returns> 88 /// <returns></returns>
89 protected virtual IClientAPI CreateNewCircuit( 89 protected virtual IClientAPI CreateNewCircuit(
90 EndPoint remoteEP, IScene scene, IAssetCache assetCache, 90 EndPoint remoteEP, IScene scene,
91 LLPacketServer packServer, AuthenticateResponse sessionInfo, 91 LLPacketServer packServer, AuthenticateResponse sessionInfo,
92 UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP) 92 UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP)
93 { 93 {
94 return 94 return
95 new LLClientView( 95 new LLClientView(
96 remoteEP, scene, assetCache, packServer, sessionInfo, agentId, sessionId, circuitCode, proxyEP, 96 remoteEP, scene, packServer, sessionInfo, agentId, sessionId, circuitCode, proxyEP,
97 m_userSettings); 97 m_userSettings);
98 } 98 }
99 99
@@ -131,7 +131,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
131 /// true if a new circuit was created, false if a circuit with the given circuit code already existed 131 /// true if a new circuit was created, false if a circuit with the given circuit code already existed
132 /// </returns> 132 /// </returns>
133 public virtual bool AddNewClient( 133 public virtual bool AddNewClient(
134 EndPoint epSender, UseCircuitCodePacket useCircuit, IAssetCache assetCache, 134 EndPoint epSender, UseCircuitCodePacket useCircuit,
135 AuthenticateResponse sessionInfo, EndPoint proxyEP) 135 AuthenticateResponse sessionInfo, EndPoint proxyEP)
136 { 136 {
137 IClientAPI newuser; 137 IClientAPI newuser;
@@ -150,7 +150,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
150 150
151 newuser 151 newuser
152 = CreateNewCircuit( 152 = CreateNewCircuit(
153 epSender, m_scene, assetCache, this, sessionInfo, agentId, sessionId, circuitCode, proxyEP); 153 epSender, m_scene, this, sessionInfo, agentId, sessionId, circuitCode, proxyEP);
154 154
155 m_scene.ClientManager.Add(circuitCode, newuser); 155 m_scene.ClientManager.Add(circuitCode, newuser);
156 156
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 54434f1..5184e35 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -75,7 +75,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
75 protected bool Allow_Alternate_Port; 75 protected bool Allow_Alternate_Port;
76 protected IPAddress listenIP = IPAddress.Parse("0.0.0.0"); 76 protected IPAddress listenIP = IPAddress.Parse("0.0.0.0");
77 protected IScene m_localScene; 77 protected IScene m_localScene;
78 protected IAssetCache m_assetCache;
79 protected int m_clientSocketReceiveBuffer = 0; 78 protected int m_clientSocketReceiveBuffer = 0;
80 79
81 /// <value> 80 /// <value>
@@ -131,7 +130,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
131 130
132 public LLUDPServer( 131 public LLUDPServer(
133 IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource, 132 IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource,
134 IAssetCache assetCache, AgentCircuitManager authenticateClass) 133 AgentCircuitManager authenticateClass)
135 { 134 {
136 Initialise(_listenIP, ref port, proxyPortOffset, allow_alternate_port, configSource, authenticateClass); 135 Initialise(_listenIP, ref port, proxyPortOffset, allow_alternate_port, configSource, authenticateClass);
137 } 136 }
@@ -451,7 +450,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
451 proxyCircuits[useCircuit.CircuitCode.Code] = epProxy; 450 proxyCircuits[useCircuit.CircuitCode.Code] = epProxy;
452 } 451 }
453 452
454 m_packetServer.AddNewClient(epSender, useCircuit, m_assetCache, sessionInfo, epProxy); 453 m_packetServer.AddNewClient(epSender, useCircuit, sessionInfo, epProxy);
455 454
456 //m_log.DebugFormat( 455 //m_log.DebugFormat(
457 // "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}", 456 // "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}",
@@ -629,7 +628,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
629 } 628 }
630 } 629 }
631 630
632 m_packetServer.AddNewClient(userEP, useCircuit, m_assetCache, sessionInfo, proxyEP); 631 m_packetServer.AddNewClient(userEP, useCircuit, sessionInfo, proxyEP);
633 } 632 }
634 } 633 }
635} 634}
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 2fbbbe2..a266a40 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -72,15 +72,7 @@ namespace OpenSim.Region.ClientStack
72 get { return m_sceneManager; } 72 get { return m_sceneManager; }
73 } 73 }
74 protected SceneManager m_sceneManager = new SceneManager(); 74 protected SceneManager m_sceneManager = new SceneManager();
75 75
76 protected IAssetCache m_assetCache;
77
78 public IAssetCache AssetCache
79 {
80 get { return m_assetCache; }
81 set { m_assetCache = value; }
82 }
83
84 protected abstract void Initialize(); 76 protected abstract void Initialize();
85 77
86 /// <summary> 78 /// <summary>
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
index 3ea987c..1bfc736 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -44,7 +44,6 @@ namespace OpenSim.Region.Communications.Hypergrid
44 ConfigSettings configSettings, 44 ConfigSettings configSettings,
45 NetworkServersInfo serversInfo, 45 NetworkServersInfo serversInfo,
46 BaseHttpServer httpServer, 46 BaseHttpServer httpServer,
47 IAssetCache assetCache,
48 HGGridServices gridService, 47 HGGridServices gridService,
49 LibraryRootFolder libraryRootFolder, 48 LibraryRootFolder libraryRootFolder,
50 bool dumpAssetsToFile) 49 bool dumpAssetsToFile)
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
index 828d0d9..94cfc49 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Communications.Hypergrid
76 } 76 }
77 77
78 78
79 public HGGridServicesStandalone(NetworkServersInfo servers_info, BaseHttpServer httpServe, IAssetCache asscache, SceneManager sman) 79 public HGGridServicesStandalone(NetworkServersInfo servers_info, BaseHttpServer httpServe, SceneManager sman)
80 : base(servers_info, sman) 80 : base(servers_info, sman)
81 { 81 {
82 //Respond to Grid Services requests 82 //Respond to Grid Services requests
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
index 8cf039d..5208e7a 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
@@ -35,6 +35,7 @@ using log4net;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Serialization; 37using OpenSim.Framework.Serialization;
38using OpenSim.Services.Interfaces;
38 39
39namespace OpenSim.Region.CoreModules.World.Archiver 40namespace OpenSim.Region.CoreModules.World.Archiver
40{ 41{
@@ -60,9 +61,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
60 /// <summary> 61 /// <summary>
61 /// Cache to which dearchived assets will be added 62 /// Cache to which dearchived assets will be added
62 /// </summary> 63 /// </summary>
63 protected IAssetCache m_cache; 64 protected IAssetService m_cache;
64 65
65 public AssetsDearchiver(IAssetCache cache) 66 public AssetsDearchiver(IAssetService cache)
66 { 67 {
67 m_cache = cache; 68 m_cache = cache;
68 } 69 }
@@ -162,7 +163,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
162 asset.Type = metadata.AssetType; 163 asset.Type = metadata.AssetType;
163 asset.Data = data; 164 asset.Data = data;
164 165
165 m_cache.AddAsset(asset); 166 m_cache.Store(asset);
166 } 167 }
167 else 168 else
168 { 169 {