Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed a nasty OSD->JSON bug that was producing invalid JSON for empty arrays or dictionaries

Browse Source 
* Several fixes in OpenMetaverse.Http.CapsServer and OpenMetaverse.Http.EventQueueServer (this is the first time they've been tested)
[Simian]
* Initial capabilities and EventQueue support (appears to be working)
* HyperGrid is almost working
* More cleanup with how agents are removed from the scene

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2427 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2009-02-04 23:00:33 +00:00
parent 875aa0b6e8
commit 808b681b83
17 changed files with 689 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Programs/Simian/Extensions/AssetManager.cs
View File

@@ -23,12 +23,12 @@ namespace Simian.Extensions
{
this.server = server;
UploadDir = Path.Combine(server.DataDir, UPLOAD_DIR);
UploadDir = Path.Combine(Simian.DATA_DIR, UPLOAD_DIR);
// Try to create the data directories if they don't already exist
if (!Directory.Exists(server.DataDir))
if (!Directory.Exists(Simian.DATA_DIR))
{
try { Directory.CreateDirectory(server.DataDir); }
try { Directory.CreateDirectory(Simian.DATA_DIR); }
catch (Exception ex) { Logger.Log(ex.Message, Helpers.LogLevel.Warning, ex); }
}
if (!Directory.Exists(UploadDir))
@@ -37,7 +37,7 @@ namespace Simian.Extensions
catch (Exception ex) { Logger.Log(ex.Message, Helpers.LogLevel.Warning, ex); }
}
LoadAssets(server.DataDir);
LoadAssets(Simian.DATA_DIR);
LoadAssets(UploadDir);
}