diff options
| author | lbsa71 | 2007-12-27 14:00:30 +0000 |
|---|---|---|
| committer | lbsa71 | 2007-12-27 14:00:30 +0000 |
| commit | 87e2a694e200f5774f71d38041247912b5ccf98d (patch) | |
| tree | e5669eb91e90e378442353242821ba3dad0f1ab2 /OpenSim/Framework/Communications/Cache/SQLAssetServer.cs | |
| parent | * Fixed the matching logic error on the LLQuat to axiom quat :P (diff) | |
| download | opensim-SC-87e2a694e200f5774f71d38041247912b5ccf98d.zip opensim-SC-87e2a694e200f5774f71d38041247912b5ccf98d.tar.gz opensim-SC-87e2a694e200f5774f71d38041247912b5ccf98d.tar.bz2 opensim-SC-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/SQLAssetServer.cs')
| -rw-r--r-- | OpenSim/Framework/Communications/Cache/SQLAssetServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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) |