14 files changed, 64 insertions, 32 deletions

diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 1fb01ba..940ae3b 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -510,6 +510,13 @@ namespace OpenSim.Framework
                 if (te != null && te.Length > 0)
                     Texture = new Primitive.TextureEntry(te, 0, te.Length);
             }
+            else
+            {
+                // We shouldn't be receiving appearance hashtables without a TextureEntry,
+                // but in case we do this will prevent a failure when saving to the database
+                Texture = GetDefaultTexture();
+            }
+
             
             AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]);
 
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index 6f86704..57a908e 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -532,6 +532,11 @@ namespace OpenSim.Framework.Communications.Tests
             return false;
         }
 
+        public bool DeleteFolders(UUID ownerID, List<UUID> ids)
+        {
+            return false;
+        }
+
         public bool PurgeFolder(InventoryFolderBase folder)
         {
             return false;
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index 3387013..06136ff 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -576,7 +576,7 @@ namespace OpenSim.Framework.Console
 
         public void Prompt()
         {
-            string line = ReadLine(m_defaultPrompt, true, true);
+            string line = ReadLine(m_defaultPrompt + "# ", true, true);
 
             if (line != String.Empty)
             {
@@ -592,7 +592,7 @@ namespace OpenSim.Framework.Console
 
         public override string ReadLine(string p, bool isCommand, bool e)
         {
-            System.Console.Write("{0}", prompt);
+            System.Console.Write("{0}", p);
             string cmdinput = System.Console.ReadLine();
 
             if (isCommand)
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 5e258ae..0a51266 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Console
         /// </summary>
         public string DefaultPrompt
         {
-            set { m_defaultPrompt = value + "# "; }
+            set { m_defaultPrompt = value; }
             get { return m_defaultPrompt; }
         }
         protected string m_defaultPrompt;
@@ -123,7 +123,7 @@ namespace OpenSim.Framework.Console
 
         public virtual string ReadLine(string p, bool isCommand, bool e)
         {
-            System.Console.Write("{0}", prompt);
+            System.Console.Write("{0}", p);
             string cmdinput = System.Console.ReadLine();
 
             return cmdinput;
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index da8556a..67bff4c 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -50,8 +50,6 @@ namespace OpenSim.Framework.Console
     //
     public class RemoteConsole : CommandConsole
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
         private IHttpServer m_Server = null;
         private IConfigSource m_Config = null;
 
@@ -217,6 +215,12 @@ namespace OpenSim.Framework.Console
             id.AppendChild(xmldoc.CreateTextNode(sessionID.ToString()));
 
             rootElement.AppendChild(id);
+
+            XmlElement prompt = xmldoc.CreateElement("", "Prompt", "");
+            prompt.AppendChild(xmldoc.CreateTextNode(DefaultPrompt));
+
+            rootElement.AppendChild(prompt);
+
             rootElement.AppendChild(MainConsole.Instance.Commands.GetXml(xmldoc));
 
             reply["str_response_string"] = xmldoc.InnerXml;
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 87fd3f0..9aa5d03 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -98,10 +98,10 @@ namespace OpenSim.Framework
                                                 "True", 
                                                 false);            
             m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                 "Remote console access user name [Default: disabled]", "0", false);
+                                                 "Remote console access user name [Default: disabled]", "", false);
 
             m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                 "Remote console access password [Default: disabled]", "0", false);
+                                                 "Remote console access password [Default: disabled]", "", false);
 
         }
 
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index c6cdcaa..444adf9 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -260,7 +260,7 @@ namespace OpenSim.Framework
         IClientAPI remoteClient, List<UUID> itemIDs);
 
     public delegate void RemoveInventoryFolder(
-        IClientAPI remoteClient, UUID folderID);
+        IClientAPI remoteClient, List<UUID> folderIDs);
 
     public delegate void RequestAsset(IClientAPI remoteClient, RequestAssetArgs transferRequest);
 
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
index 61e5ea7..884c0ea 100644
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ b/OpenSim/Framework/MessageServerConfig.cs
@@ -91,10 +91,10 @@ namespace OpenSim.Framework
             m_configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "My Published IP Address", "127.0.0.1", false);
             m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Remote console access user name [Default: disabled]", "0", false);
+                                                "Remote console access user name [Default: disabled]", "", false);
 
             m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Remote console access password [Default: disabled]", "0", false);
+                                                "Remote console access password [Default: disabled]", "", false);
 
         }
 
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
index d8cbeac..41fb376 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
@@ -59,6 +59,8 @@ using System.IO;
 using System.Text;
 using HttpServer;
 using OpenMetaverse;
+using System.Reflection;
+using log4net;
 
 namespace OpenSim.Framework.Servers.HttpServer
 {
@@ -66,6 +68,10 @@ namespace OpenSim.Framework.Servers.HttpServer
     
     public class PollServiceWorkerThread
     {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
         public event ReQueuePollServiceItem ReQueue;
 
         private readonly BaseHttpServer m_server;
@@ -92,31 +98,36 @@ namespace OpenSim.Framework.Servers.HttpServer
             while (m_running)
             {
                 PollServiceHttpRequest req = m_request.Dequeue();
-                if (req.PollServiceArgs.HasEvents(req.PollServiceArgs.Id))
+                try
                 {
-                    StreamReader str = new StreamReader(req.Request.Body);
-
-                    Hashtable responsedata = req.PollServiceArgs.GetEvents(req.PollServiceArgs.Id, str.ReadToEnd());
-                    m_server.DoHTTPGruntWork(responsedata,
-                                             new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
-                }
-                else
-                {
-                    if ((Environment.TickCount - req.RequestTime) > m_timeout)
+                    if (req.PollServiceArgs.HasEvents(req.PollServiceArgs.Id))
                     {
-                        m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(),
+                        StreamReader str = new StreamReader(req.Request.Body);
+
+                        Hashtable responsedata = req.PollServiceArgs.GetEvents(req.PollServiceArgs.Id, str.ReadToEnd());
+                        m_server.DoHTTPGruntWork(responsedata,
                                                  new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
                     }
                     else
                     {
-                        ReQueuePollServiceItem reQueueItem = ReQueue;
-                        if (reQueueItem != null)
-                            reQueueItem(req);
+                        if ((Environment.TickCount - req.RequestTime) > m_timeout)
+                        {
+                            m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(),
+                                                     new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
+                        }
+                        else
+                        {
+                            ReQueuePollServiceItem reQueueItem = ReQueue;
+                            if (reQueueItem != null)
+                                reQueueItem(req);
+                        }
                     }
                 }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat("Exception in poll service thread: " + e.ToString());
+                }
             }
-
-
         }
 
         internal void Enqueue(PollServiceHttpRequest pPollServiceHttpRequest)
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
index ec2f9ec..2ef4a36 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
@@ -75,6 +75,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
             request.ContentType = "text/xml";
+            request.Timeout = 20000;
 
             MemoryStream buffer = new MemoryStream();
 
@@ -98,7 +99,9 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
                 XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
                 deserial = (TResponse)deserializer.Deserialize(resp.GetResponseStream());
+                resp.Close();
             }
+            requestStream.Close();
             return deserial;
         }
     }
diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
index 09ef95b..ec9bd4f 100644
--- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
+++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
 
-            if (verb == "POST")
+            if ((verb == "POST") || (verb == "PUT"))
             {
                 request.ContentType = "text/xml";
 
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index b9e3665..16f265c 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -158,10 +158,10 @@ namespace OpenSim.Framework
                                                 "Minimum Level a user should have to login [0 default]", "0", false);
             
             m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Remote console access user name [Default: disabled]", "0", false);
+                                                "Remote console access user name [Default: disabled]", "", false);
             
             m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Remote console access password [Default: disabled]", "0", false);
+                                                "Remote console access password [Default: disabled]", "", false);
             
         }
 
diff --git a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs b/OpenSim/Grid/InventoryServer/AuthedSessionCache.cs
index d56e48a..dadf34a 100644
--- a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs
+++ b/OpenSim/Grid/InventoryServer/AuthedSessionCache.cs
@@ -28,7 +28,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace OpenSim.Framework.Communications.Cache
+namespace OpenSim.Grid.InventoryServer
 {
     public class AuthedSessionCache
     {
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Grid/InventoryServer/InventoryServiceBase.cs
index 309c415..f8b4949 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Grid/InventoryServer/InventoryServiceBase.cs
@@ -30,8 +30,10 @@ using System.Reflection;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Data;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
 
-namespace OpenSim.Framework.Communications
+namespace OpenSim.Grid.InventoryServer
 {
     /// <summary>
     /// Abstract base class used by local and grid implementations of an inventory service.