aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2008-11-06 19:27:18 +0000
committerCharles Krinke2008-11-06 19:27:18 +0000
commit17e43dcc0f32cbdb030e20495dc179a6f8c3ef09 (patch)
tree07c7b9cb013eacbc22ccf40065883a92e3ba37c6
parentThank you kindly, Diva, for a patch that: (diff)
downloadopensim-SC_OLD-17e43dcc0f32cbdb030e20495dc179a6f8c3ef09.zip
opensim-SC_OLD-17e43dcc0f32cbdb030e20495dc179a6f8c3ef09.tar.gz
opensim-SC_OLD-17e43dcc0f32cbdb030e20495dc179a6f8c3ef09.tar.bz2
opensim-SC_OLD-17e43dcc0f32cbdb030e20495dc179a6f8c3ef09.tar.xz
Mantis#2566. Thank you kindly, Diva for a patch that:
This patch introduces a couple of read-only properties, so that I can grab the asset server plugin from a region module. This is needed to set up an http service for accessing standalone assets remotely.
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs5
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs5
2 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 5c8fddc..dfdb0e7 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -85,6 +85,11 @@ namespace OpenSim.Framework.Communications.Cache
85 /// </summary> 85 /// </summary>
86 private readonly IAssetServer m_assetServer; 86 private readonly IAssetServer m_assetServer;
87 87
88 public IAssetServer AssetServer
89 {
90 get { return m_assetServer; }
91 }
92
88 /// <summary> 93 /// <summary>
89 /// Report statistical data. 94 /// Report statistical data.
90 /// </summary> 95 /// </summary>
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 9f4f480..a289fb7 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -45,6 +45,11 @@ namespace OpenSim.Framework.Communications.Cache
45 protected Thread m_localAssetServerThread; 45 protected Thread m_localAssetServerThread;
46 protected IAssetProviderPlugin m_assetProvider; 46 protected IAssetProviderPlugin m_assetProvider;
47 47
48 public IAssetProviderPlugin AssetProviderPlugin
49 {
50 get { return m_assetProvider; }
51 }
52
48 // Temporarily hardcoded - should be a plugin 53 // Temporarily hardcoded - should be a plugin
49 protected IAssetLoader assetLoader = new AssetLoaderFileSystem(); 54 protected IAssetLoader assetLoader = new AssetLoaderFileSystem();
50 55