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

* 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

Programs/Simian/Simian.cs

@@ -6,6 +6,7 @@ using System.Text;
 using System.Xml;
 using System.Threading;
 using System.Reflection;
+using System.Security.Cryptography.X509Certificates;
 using ExtensionLoader;
 using ExtensionLoader.Config;
 using HttpServer;
@@ -17,10 +18,12 @@ namespace Simian
     public partial class Simian
     {
         public const string CONFIG_FILE = "Simian.ini";
+        public const string DATA_DIR = "SimianData/";
 
-        public int UDPPort = 9000;
-        public int HttpPort = 8002;
-        public string DataDir = "SimianData/";
+        public int UDPPort { get { return 9000; } }
+        public int HttpPort { get { return 8002; } }
+        public bool SSL { get { return false; } }
+        public string HostName { get { return Dns.GetHostName(); } }
 
         public WebServer HttpServer;
         public IniConfigSource ConfigFile;
@@ -35,7 +38,7 @@ namespace Simian
         public IInventoryProvider Inventory;
         public IParcelProvider Parcels;
         public IMeshingProvider Mesher;
-        //public ICapabilitiesProvider Capabilities;
+        public ICapabilitiesProvider Capabilities;
 
         // Persistent extensions
         public List<IPersistable> PersistentExtensions = new List<IPersistable>();
@@ -61,7 +64,9 @@ namespace Simian
                 return false;
             }
 
-            InitHttpServer(HttpPort, true);
+            // TODO: SSL support
+            HttpServer = new WebServer(IPAddress.Any, HttpPort);
+            HttpServer.Start();
 
             try
             {
@@ -123,12 +128,5 @@ namespace Simian
 
             HttpServer.Stop();
         }
-
-        void InitHttpServer(int port, bool ssl)
-        {
-            HttpServer = new WebServer(IPAddress.Any, port);
-
-            HttpServer.Start();
-        }
     }
 }