diff options
Diffstat (limited to 'OpenSim/Framework/Communications')
4 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs index 4ad0f60..ae6494f 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServer.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
72 | } | 72 | } |
73 | } | 73 | } |
74 | 74 | ||
75 | protected override AssetBase _ProcessRequest(AssetRequest req) | 75 | protected override AssetBase GetAsset(AssetRequest req) |
76 | { | 76 | { |
77 | byte[] idata = null; | 77 | byte[] idata = null; |
78 | bool found = false; | 78 | bool found = false; |
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs index f5ebab7..43d3dd9 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs | |||
@@ -54,16 +54,16 @@ namespace OpenSim.Framework.Communications.Cache | |||
54 | /// </summary> | 54 | /// </summary> |
55 | /// <param name="req"></param> | 55 | /// <param name="req"></param> |
56 | /// <returns></returns> | 56 | /// <returns></returns> |
57 | protected abstract AssetBase _ProcessRequest(AssetRequest req); | 57 | protected abstract AssetBase GetAsset(AssetRequest req); |
58 | 58 | ||
59 | /// <summary> | 59 | /// <summary> |
60 | /// Process an asset request. This method will call _ProcessRequest(AssetRequest req) | 60 | /// Process an asset request. This method will call GetAsset(AssetRequest req) |
61 | /// on the subclass. | 61 | /// on the subclass. |
62 | /// </summary> | 62 | /// </summary> |
63 | /// <param name="req"></param> | 63 | /// <param name="req"></param> |
64 | protected void ProcessRequest(AssetRequest req) | 64 | protected virtual void ProcessRequest(AssetRequest req) |
65 | { | 65 | { |
66 | AssetBase asset = _ProcessRequest(req); | 66 | AssetBase asset = GetAsset(req); |
67 | 67 | ||
68 | if (asset != null) | 68 | if (asset != null) |
69 | { | 69 | { |
diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs index 5801aa8..9c460c7 100644 --- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
47 | 47 | ||
48 | #region IAssetServer Members | 48 | #region IAssetServer Members |
49 | 49 | ||
50 | protected override AssetBase _ProcessRequest(AssetRequest req) | 50 | protected override AssetBase GetAsset(AssetRequest req) |
51 | { | 51 | { |
52 | Stream s = null; | 52 | Stream s = null; |
53 | try | 53 | try |
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs index 4fa7684..7fcff10 100644 --- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs +++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs | |||
@@ -77,7 +77,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
77 | m_assetProviderPlugin.CommitAssets(); | 77 | m_assetProviderPlugin.CommitAssets(); |
78 | } | 78 | } |
79 | 79 | ||
80 | protected override AssetBase _ProcessRequest(AssetRequest req) | 80 | protected override AssetBase GetAsset(AssetRequest req) |
81 | { | 81 | { |
82 | AssetBase asset; | 82 | AssetBase asset; |
83 | lock (syncLock) | 83 | lock (syncLock) |