aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Communications/Cache')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs10
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServer.cs5
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs10
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs7
-rw-r--r--OpenSim/Framework/Communications/Cache/GridAssetClient.cs5
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs13
-rw-r--r--OpenSim/Framework/Communications/Cache/SQLAssetServer.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs10
8 files changed, 33 insertions, 31 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 4d37e74..c81ea35 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -27,11 +27,11 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using System.Threading; 31using System.Threading;
31using libsecondlife; 32using libsecondlife;
32using libsecondlife.Packets; 33using libsecondlife.Packets;
33 34using log4net;
34using OpenSim.Framework.Console;
35using OpenSim.Framework.Statistics; 35using OpenSim.Framework.Statistics;
36 36
37namespace OpenSim.Framework.Communications.Cache 37namespace OpenSim.Framework.Communications.Cache
@@ -52,8 +52,8 @@ namespace OpenSim.Framework.Communications.Cache
52 /// </summary> 52 /// </summary>
53 public class AssetCache : IAssetReceiver 53 public class AssetCache : IAssetReceiver
54 { 54 {
55 private static readonly log4net.ILog m_log 55 private static readonly ILog m_log
56 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 56 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
57 57
58 /// <summary> 58 /// <summary>
59 /// The cache of assets. This does not include textures. 59 /// The cache of assets. This does not include textures.
@@ -170,7 +170,7 @@ namespace OpenSim.Framework.Communications.Cache
170 m_assetCacheThread.Name = "AssetCacheThread"; 170 m_assetCacheThread.Name = "AssetCacheThread";
171 m_assetCacheThread.IsBackground = true; 171 m_assetCacheThread.IsBackground = true;
172 m_assetCacheThread.Start(); 172 m_assetCacheThread.Start();
173 OpenSim.Framework.ThreadTracker.Add(m_assetCacheThread); 173 ThreadTracker.Add(m_assetCacheThread);
174 } 174 }
175 175
176 /// <summary> 176 /// <summary>
diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs
index 3ce28c2..891fa6d 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs
@@ -25,16 +25,17 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using System.IO; 27using System.IO;
28using System.Reflection;
28using Db4objects.Db4o; 29using Db4objects.Db4o;
29using Db4objects.Db4o.Query; 30using Db4objects.Db4o.Query;
30using libsecondlife; 31using libsecondlife;
31using OpenSim.Framework.Console; 32using log4net;
32 33
33namespace OpenSim.Framework.Communications.Cache 34namespace OpenSim.Framework.Communications.Cache
34{ 35{
35 public class LocalAssetServer : AssetServerBase 36 public class LocalAssetServer : AssetServerBase
36 { 37 {
37 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 38 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38 39
39 private IObjectContainer db; 40 private IObjectContainer db;
40 41
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 261b697..1a7f872 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -26,18 +26,18 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Reflection;
30using System.Threading; 30using System.Threading;
31using libsecondlife; 31using libsecondlife;
32using OpenSim.Framework.Console; 32using log4net;
33using OpenSim.Framework.AssetLoader.Filesystem; 33using OpenSim.Framework.AssetLoader.Filesystem;
34 34
35namespace OpenSim.Framework.Communications.Cache 35namespace OpenSim.Framework.Communications.Cache
36{ 36{
37 public abstract class AssetServerBase : IAssetServer 37 public abstract class AssetServerBase : IAssetServer
38 { 38 {
39 private static readonly log4net.ILog m_log 39 private static readonly ILog m_log
40 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 40 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 41
42 protected IAssetReceiver m_receiver; 42 protected IAssetReceiver m_receiver;
43 protected BlockingQueue<AssetRequest> m_assetRequests; 43 protected BlockingQueue<AssetRequest> m_assetRequests;
@@ -100,7 +100,7 @@ namespace OpenSim.Framework.Communications.Cache
100 m_localAssetServerThread.Name = "LocalAssetServerThread"; 100 m_localAssetServerThread.Name = "LocalAssetServerThread";
101 m_localAssetServerThread.IsBackground = true; 101 m_localAssetServerThread.IsBackground = true;
102 m_localAssetServerThread.Start(); 102 m_localAssetServerThread.Start();
103 OpenSim.Framework.ThreadTracker.Add(m_localAssetServerThread); 103 ThreadTracker.Add(m_localAssetServerThread);
104 } 104 }
105 105
106 private void RunRequests() 106 private void RunRequests()
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index ec5717e..a245af1 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -27,8 +27,9 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net;
32 33
33namespace OpenSim.Framework.Communications.Cache 34namespace OpenSim.Framework.Communications.Cache
34{ 35{
@@ -37,8 +38,8 @@ namespace OpenSim.Framework.Communications.Cache
37 /// </summary> 38 /// </summary>
38 public class CachedUserInfo 39 public class CachedUserInfo
39 { 40 {
40 private static readonly log4net.ILog m_log 41 private static readonly ILog m_log
41 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 43
43 /// <summary> 44 /// <summary>
44 /// The comms manager holds references to services (user, grid, inventory, etc.) 45 /// The comms manager holds references to services (user, grid, inventory, etc.)
diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
index 3e703d2..d5b7fea 100644
--- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
@@ -27,15 +27,16 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection;
30using System.Xml.Serialization; 31using System.Xml.Serialization;
31using OpenSim.Framework.Console; 32using log4net;
32using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
33 34
34namespace OpenSim.Framework.Communications.Cache 35namespace OpenSim.Framework.Communications.Cache
35{ 36{
36 public class GridAssetClient : AssetServerBase 37 public class GridAssetClient : AssetServerBase
37 { 38 {
38 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 40
40 private string _assetServerUrl; 41 private string _assetServerUrl;
41 42
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 03036d0..a39738d 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -28,10 +28,11 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection;
31using System.Xml; 32using System.Xml;
32using libsecondlife; 33using libsecondlife;
34using log4net;
33using Nini.Config; 35using Nini.Config;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Framework.Communications.Cache 37namespace OpenSim.Framework.Communications.Cache
37{ 38{
@@ -41,7 +42,7 @@ namespace OpenSim.Framework.Communications.Cache
41 /// </summary> 42 /// </summary>
42 public class LibraryRootFolder : InventoryFolderImpl 43 public class LibraryRootFolder : InventoryFolderImpl
43 { 44 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 46
46 private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000"); 47 private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000");
47 48
@@ -153,13 +154,13 @@ namespace OpenSim.Framework.Communications.Cache
153 { 154 {
154 string foldersPath 155 string foldersPath
155 = Path.Combine( 156 = Path.Combine(
156 Util.inventoryDir(), config.GetString("foldersFile", System.String.Empty)); 157 Util.inventoryDir(), config.GetString("foldersFile", String.Empty));
157 158
158 LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig); 159 LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig);
159 160
160 string itemsPath 161 string itemsPath
161 = Path.Combine( 162 = Path.Combine(
162 Util.inventoryDir(), config.GetString("itemsFile", System.String.Empty)); 163 Util.inventoryDir(), config.GetString("itemsFile", String.Empty));
163 164
164 LoadFromFile(itemsPath, "Library items", ReadItemFromConfig); 165 LoadFromFile(itemsPath, "Library items", ReadItemFromConfig);
165 } 166 }
@@ -209,8 +210,8 @@ namespace OpenSim.Framework.Communications.Cache
209 item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString())); 210 item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString()));
210 item.AssetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString())); 211 item.AssetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString()));
211 item.Folder = new LLUUID(config.GetString("folderID", ID.ToString())); 212 item.Folder = new LLUUID(config.GetString("folderID", ID.ToString()));
212 item.Description = config.GetString("description", System.String.Empty); 213 item.Description = config.GetString("description", String.Empty);
213 item.Name = config.GetString("name", System.String.Empty); 214 item.Name = config.GetString("name", String.Empty);
214 item.AssetType = config.GetInt("assetType", 0); 215 item.AssetType = config.GetInt("assetType", 0);
215 item.InvType = config.GetInt("inventoryType", 0); 216 item.InvType = config.GetInt("inventoryType", 0);
216 item.CurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF); 217 item.CurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF);
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index 4f1a304..1afec70 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -27,13 +27,13 @@
27 27
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using OpenSim.Framework.Console; 30using log4net;
31 31
32namespace OpenSim.Framework.Communications.Cache 32namespace OpenSim.Framework.Communications.Cache
33{ 33{
34 public class SQLAssetServer : AssetServerBase 34 public class SQLAssetServer : AssetServerBase
35 { 35 {
36 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 36 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 37
38 public SQLAssetServer(string pluginName) 38 public SQLAssetServer(string pluginName)
39 { 39 {
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 9813756..bf8ff40 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -25,13 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection;
30using System.Threading; 30using System.Threading;
31
32using libsecondlife; 31using libsecondlife;
33 32using log4net;
34using OpenSim.Framework.Console;
35 33
36namespace OpenSim.Framework.Communications.Cache 34namespace OpenSim.Framework.Communications.Cache
37{ 35{
@@ -40,8 +38,8 @@ namespace OpenSim.Framework.Communications.Cache
40 /// </summary> 38 /// </summary>
41 public class UserProfileCacheService 39 public class UserProfileCacheService
42 { 40 {
43 private static readonly log4net.ILog m_log 41 private static readonly ILog m_log
44 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 43
46 /// <summary> 44 /// <summary>
47 /// The comms manager holds references to services (user, grid, inventory, etc.) 45 /// The comms manager holds references to services (user, grid, inventory, etc.)