aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
diff options
context:
space:
mode:
authorlbsa712007-12-27 14:00:30 +0000
committerlbsa712007-12-27 14:00:30 +0000
commit87e2a694e200f5774f71d38041247912b5ccf98d (patch)
treee5669eb91e90e378442353242821ba3dad0f1ab2 /OpenSim/Framework/Communications/Cache/AssetServerBase.cs
parent* Fixed the matching logic error on the LLQuat to axiom quat :P (diff)
downloadopensim-SC_OLD-87e2a694e200f5774f71d38041247912b5ccf98d.zip
opensim-SC_OLD-87e2a694e200f5774f71d38041247912b5ccf98d.tar.gz
opensim-SC_OLD-87e2a694e200f5774f71d38041247912b5ccf98d.tar.bz2
opensim-SC_OLD-87e2a694e200f5774f71d38041247912b5ccf98d.tar.xz
* AssetServerBase: _ProcessRequest is now called GetAsset
* PrimitiveBaseShape: The textures are now exposed as a 'TextureEntry Textures'; all serialization still using the 'byte[] TextureEntry' for backwards compatibility. * Scene: Re-added AddTree, since the Tree type isn't gone from libsl, merely relocated.
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/AssetServerBase.cs')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs8
1 files changed, 4 insertions, 4 deletions
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 {