diff options
author | lbsa71 | 2007-10-19 07:46:03 +0000 |
---|---|---|
committer | lbsa71 | 2007-10-19 07:46:03 +0000 |
commit | 46700d3b7d5bd71d880b3cc0dd0e2d6edd701195 (patch) | |
tree | 7f2d7a8c71e288daaa2b9b6f4d6ed35b0ef54d21 /OpenSim/Framework/General | |
parent | Fix for assetserver crashing (Thank you Chi11ken) (diff) | |
download | opensim-SC_OLD-46700d3b7d5bd71d880b3cc0dd0e2d6edd701195.zip opensim-SC_OLD-46700d3b7d5bd71d880b3cc0dd0e2d6edd701195.tar.gz opensim-SC_OLD-46700d3b7d5bd71d880b3cc0dd0e2d6edd701195.tar.bz2 opensim-SC_OLD-46700d3b7d5bd71d880b3cc0dd0e2d6edd701195.tar.xz |
* Total refactoring of Asset Server for massive win
* There is now a AssetServerBase
* lolcat in ur assets
Diffstat (limited to 'OpenSim/Framework/General')
-rw-r--r-- | OpenSim/Framework/General/Interfaces/IAssetServer.cs | 3 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/AssetBase.cs | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Framework/General/Interfaces/IAssetServer.cs b/OpenSim/Framework/General/Interfaces/IAssetServer.cs index f6849bf..e7401eb 100644 --- a/OpenSim/Framework/General/Interfaces/IAssetServer.cs +++ b/OpenSim/Framework/General/Interfaces/IAssetServer.cs | |||
@@ -39,9 +39,10 @@ namespace OpenSim.Framework.Interfaces | |||
39 | void SetReceiver(IAssetReceiver receiver); | 39 | void SetReceiver(IAssetReceiver receiver); |
40 | void FetchAsset(LLUUID assetID, bool isTexture); | 40 | void FetchAsset(LLUUID assetID, bool isTexture); |
41 | void UpdateAsset(AssetBase asset); | 41 | void UpdateAsset(AssetBase asset); |
42 | void CreateAsset(AssetBase asset); | 42 | void StoreAndCommitAsset(AssetBase asset); |
43 | void SetServerInfo(string ServerUrl, string ServerKey); | 43 | void SetServerInfo(string ServerUrl, string ServerKey); |
44 | void Close(); | 44 | void Close(); |
45 | void LoadAsset(AssetBase info, bool image, string filename); | ||
45 | } | 46 | } |
46 | 47 | ||
47 | // could change to delegate? | 48 | // could change to delegate? |
diff --git a/OpenSim/Framework/General/Types/AssetBase.cs b/OpenSim/Framework/General/Types/AssetBase.cs index ddd033f..628724d 100644 --- a/OpenSim/Framework/General/Types/AssetBase.cs +++ b/OpenSim/Framework/General/Types/AssetBase.cs | |||
@@ -44,5 +44,11 @@ namespace OpenSim.Framework.Types | |||
44 | { | 44 | { |
45 | 45 | ||
46 | } | 46 | } |
47 | |||
48 | public AssetBase(LLUUID assetId, string name) | ||
49 | { | ||
50 | FullID = assetId; | ||
51 | Name = name; | ||
52 | } | ||
47 | } | 53 | } |
48 | } | 54 | } |