* 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.

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
         /// </summary>
         /// <param name="req"></param>
         /// <returns></returns>
-        protected abstract AssetBase _ProcessRequest(AssetRequest req);
+        protected abstract AssetBase GetAsset(AssetRequest req);
 
         /// <summary>
-        /// Process an asset request.  This method will call _ProcessRequest(AssetRequest req) 
+        /// Process an asset request.  This method will call GetAsset(AssetRequest req) 
         /// on the subclass.
         /// </summary>
         /// <param name="req"></param>
-        protected void ProcessRequest(AssetRequest req)
+        protected virtual void ProcessRequest(AssetRequest req)
         {
-            AssetBase asset = _ProcessRequest(req);
+            AssetBase asset = GetAsset(req);
 
             if (asset != null)
             {