* Added IAssetProvider interface, converted AssetManager to new interface
* Some prep work to get ready for proper image delivery

git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@2206 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2008-09-09 00:41:55 +00:00
parent acda9ee118
commit 9fda90f2a0
4 changed files with 72 additions and 39 deletions

View File

@@ -20,11 +20,11 @@ namespace Simian
public HttpServer HttpServer;
public ulong RegionHandle;
public float WaterHeight = 35.0f;
public Dictionary<UUID, Asset> AssetStore = new Dictionary<UUID, Asset>();
// Interfaces
public IUDPProvider UDP;
public ISceneProvider Scene;
public IAssetProvider Assets;
public IAvatarProvider Avatars;
public IInventoryProvider Inventory;
public IMeshingProvider Mesher;
@@ -122,6 +122,8 @@ namespace Simian
UDP = (IUDPProvider)extension;
else if (extension is ISceneProvider)
Scene = (ISceneProvider)extension;
else if (extension is IAssetProvider)
Assets = (IAssetProvider)extension;
else if (extension is IAvatarProvider)
Avatars = (IAvatarProvider)extension;
else if (extension is IInventoryProvider)
@@ -133,32 +135,21 @@ namespace Simian
bool CheckInterfaces()
{
if (UDP == null)
{
Logger.Log("No IUDPProvider interface loaded", Helpers.LogLevel.Error);
return false;
}
else if (Scene == null)
{
Logger.Log("No ISceneProvider interface loaded", Helpers.LogLevel.Error);
return false;
}
else if (Assets == null)
Logger.Log("No IAssetProvider interface loaded", Helpers.LogLevel.Error);
else if (Avatars == null)
{
Logger.Log("No IAvatarProvider interface loaded", Helpers.LogLevel.Error);
return false;
}
if (Inventory == null)
{
else if (Inventory == null)
Logger.Log("No IInventoryProvider interface loaded", Helpers.LogLevel.Error);
return false;
}
if (Mesher == null)
{
else if (Mesher == null)
Logger.Log("No IMeshingProvider interface loaded", Helpers.LogLevel.Error);
return false;
}
else
return true;
return true;
return false;
}
void InitHttpServer(int port, bool ssl)