aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorSean Dague2009-02-18 13:15:07 +0000
committerSean Dague2009-02-18 13:15:07 +0000
commit8ed631307b97025bf25a5a08fa49223c3ad39eda (patch)
treeedfc91729dd7dc42534e5bcdd196d428469f099c /OpenSim/Framework
parentFrom: Christopher Yeoh <yeohc@au1.ibm.com> (diff)
downloadopensim-SC_OLD-8ed631307b97025bf25a5a08fa49223c3ad39eda.zip
opensim-SC_OLD-8ed631307b97025bf25a5a08fa49223c3ad39eda.tar.gz
opensim-SC_OLD-8ed631307b97025bf25a5a08fa49223c3ad39eda.tar.bz2
opensim-SC_OLD-8ed631307b97025bf25a5a08fa49223c3ad39eda.tar.xz
From: Alan Webb <awebb@linux.vnet.ibm.com>
I've changed the extension point name, and the internal references that used the same string. I also fixed up the messaging around the asset loader so that it is more explicit.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Resources/AssetCache.addin.xml10
-rw-r--r--OpenSim/Framework/IAssetServer.cs12
2 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Framework/Communications/Resources/AssetCache.addin.xml b/OpenSim/Framework/Communications/Resources/AssetCache.addin.xml
index 61a9f0f..2ac6dca 100644
--- a/OpenSim/Framework/Communications/Resources/AssetCache.addin.xml
+++ b/OpenSim/Framework/Communications/Resources/AssetCache.addin.xml
@@ -8,10 +8,10 @@
8 <Extension path="/OpenSim/AssetCache"> 8 <Extension path="/OpenSim/AssetCache">
9 <Cache id="Default" provider="Default" type="OpenSim.Framework.Communications.Cache.AssetCache" /> 9 <Cache id="Default" provider="Default" type="OpenSim.Framework.Communications.Cache.AssetCache" />
10 </Extension> 10 </Extension>
11 <Extension path="/OpenSim/AssetServerClient"> 11 <Extension path="/OpenSim/AssetClient">
12 <ServerClient id="Crypto" provider="Crypto" type="OpenSim.Framework.Communications.Cache.CryptoGridAssetClient" /> 12 <AssetClient id="Crypto" provider="Crypto" type="OpenSim.Framework.Communications.Cache.CryptoGridAssetClient" />
13 <ServerClient id="Grid" provider="Grid" type="OpenSim.Framework.Communications.Cache.GridAssetClient" /> 13 <AssetClient id="Grid" provider="Grid" type="OpenSim.Framework.Communications.Cache.GridAssetClient" />
14 <ServerClient id="File" provider="File" type="OpenSim.Framework.Communications.Cache.FileAssetClient" /> 14 <AssetClient id="File" provider="File" type="OpenSim.Framework.Communications.Cache.FileAssetClient" />
15 <ServerClient id="SQL" provider="SQL" type="OpenSim.Framework.Communications.Cache.SQLAssetServer" /> 15 <AssetClient id="SQL" provider="SQL" type="OpenSim.Framework.Communications.Cache.SQLAssetServer" />
16 </Extension> 16 </Extension>
17</Addin> 17</Addin>
diff --git a/OpenSim/Framework/IAssetServer.cs b/OpenSim/Framework/IAssetServer.cs
index 0d9afe9..f76d125 100644
--- a/OpenSim/Framework/IAssetServer.cs
+++ b/OpenSim/Framework/IAssetServer.cs
@@ -65,11 +65,11 @@ namespace OpenSim.Framework
65 void AssetNotFound(UUID assetID, bool IsTexture); 65 void AssetNotFound(UUID assetID, bool IsTexture);
66 } 66 }
67 67
68 public class AssetServerClientPluginInitialiser : PluginInitialiserBase 68 public class AssetClientPluginInitialiser : PluginInitialiserBase
69 { 69 {
70 private ConfigSettings config; 70 private ConfigSettings config;
71 71
72 public AssetServerClientPluginInitialiser (ConfigSettings p_sv) 72 public AssetClientPluginInitialiser (ConfigSettings p_sv)
73 { 73 {
74 config = p_sv; 74 config = p_sv;
75 } 75 }
@@ -80,12 +80,12 @@ namespace OpenSim.Framework
80 } 80 }
81 } 81 }
82 82
83 public class LegacyAssetServerClientPluginInitialiser : PluginInitialiserBase 83 public class LegacyAssetClientPluginInitialiser : PluginInitialiserBase
84 { 84 {
85 private ConfigSettings config; 85 private ConfigSettings config;
86 private string assetURL; 86 private string assetURL;
87 87
88 public LegacyAssetServerClientPluginInitialiser (ConfigSettings p_sv, string p_url) 88 public LegacyAssetClientPluginInitialiser (ConfigSettings p_sv, string p_url)
89 { 89 {
90 config = p_sv; 90 config = p_sv;
91 assetURL = p_url; 91 assetURL = p_url;
@@ -97,14 +97,14 @@ namespace OpenSim.Framework
97 } 97 }
98 } 98 }
99 99
100 public class CryptoAssetServerClientPluginInitialiser : PluginInitialiserBase 100 public class CryptoAssetClientPluginInitialiser : PluginInitialiserBase
101 { 101 {
102 private ConfigSettings config; 102 private ConfigSettings config;
103 private string assetURL; 103 private string assetURL;
104 private string currdir; 104 private string currdir;
105 private bool test; 105 private bool test;
106 106
107 public CryptoAssetServerClientPluginInitialiser (ConfigSettings p_sv, string p_url, string p_dir, bool p_test) 107 public CryptoAssetClientPluginInitialiser (ConfigSettings p_sv, string p_url, string p_dir, bool p_test)
108 { 108 {
109 config = p_sv; 109 config = p_sv;
110 assetURL = p_url; 110 assetURL = p_url;