Merge branch 'master' into careminster-presence-refactor

OpenSim/Data/Tests/InventoryTests.cs

@@ -323,7 +323,8 @@ namespace OpenSim.Data.Tests
                                     .IgnoreProperty(x => x.InvType)
                                     .IgnoreProperty(x => x.CreatorIdAsUuid)
                                     .IgnoreProperty(x => x.Description)
-                                    .IgnoreProperty(x => x.CreatorId));
+                                    .IgnoreProperty(x => x.CreatorId)
+                                    .IgnoreProperty(x => x.CreatorData));
 
             inventoryScrambler.Scramble(expected);
             db.updateInventoryItem(expected);
@@ -333,7 +334,8 @@ namespace OpenSim.Data.Tests
                                     .IgnoreProperty(x => x.InvType)
                                     .IgnoreProperty(x => x.CreatorIdAsUuid)
                                     .IgnoreProperty(x => x.Description)
-                                    .IgnoreProperty(x => x.CreatorId));
+                                    .IgnoreProperty(x => x.CreatorId)
+                                    .IgnoreProperty(x => x.CreatorData));
         }
 
         [Test]

OpenSim/Region/CoreModules/World/Region/RestartModule.cs

@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Reflection;
+using System.Timers;
+using System.Threading;
+using System.Collections.Generic;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using Timer=System.Timers.Timer;
+
+namespace OpenSim.Region.CoreModules.World.Region
+{
+    public class RestartModule : INonSharedRegionModule, IRestartModule
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected Scene m_Scene;
+        protected Timer m_CountdownTimer = null;
+        protected DateTime m_RestartBegin;
+        protected List<int> m_Alerts;
+        protected string m_Message;
+        protected UUID m_Initiator;
+        protected bool m_Notice = false;
+        protected IDialogModule m_DialogModule = null;
+
+        public void Initialise(IConfigSource config)
+        {
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            m_Scene = scene;
+            m_DialogModule = m_Scene.RequestModuleInterface<IDialogModule>();
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        public void Close()
+        {
+        }
+
+        public string Name
+        {
+            get { return "RestartModule"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return typeof(IRestartModule); }
+        }
+
+        public TimeSpan TimeUntilRestart
+        {
+            get { return DateTime.Now - m_RestartBegin; }
+        }
+
+        public void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice)
+        {
+            if (m_CountdownTimer != null)
+                return;
+
+            if (alerts == null)
+            {
+                m_Scene.RestartNow();
+                return;
+            }
+
+            m_Message = message;
+            m_Initiator = initiator;
+            m_Notice = notice;
+            m_Alerts = new List<int>(alerts);
+            m_Alerts.Sort();
+            m_Alerts.Reverse();
+
+            if (m_Alerts[0] == 0)
+            {
+                m_Scene.RestartNow();
+                return;
+            }
+
+            int nextInterval = DoOneNotice();
+
+            SetTimer(nextInterval);
+        }
+
+        public int DoOneNotice()
+        {
+            if (m_Alerts.Count == 0 || m_Alerts[0] == 0)
+            {
+                m_Scene.RestartNow();
+                return 0;
+            }
+
+            int nextAlert = 0;
+            while (m_Alerts.Count > 1)
+            {
+                if (m_Alerts[1] == m_Alerts[0])
+                {
+                    m_Alerts.RemoveAt(0);
+                    continue;
+                }
+                nextAlert = m_Alerts[1];
+            }
+            
+            int currentAlert = m_Alerts[0];
+
+            m_Alerts.RemoveAt(0);
+
+            int minutes = currentAlert / 60;
+            string currentAlertString = "";
+            if (minutes > 0)
+            {
+                if (minutes == 1)
+                    currentAlertString += "1 minute";
+                else
+                    currentAlertString += String.Format("{0} minutes", minutes);
+                if ((currentAlert % 60) != 0)
+                    currentAlertString += " and ";
+            }
+            if ((currentAlert % 60) != 0)
+            {
+                int seconds = currentAlert % 60;
+                if (seconds == 1)
+                    currentAlertString += "1 second";
+                else
+                    currentAlertString += String.Format("{0} seconds", seconds);
+            }
+
+            string msg = String.Format(m_Message, currentAlertString);
+
+            if (m_DialogModule != null)
+            {
+                if (m_Notice)
+                    m_DialogModule.SendGeneralAlert(msg);
+                else
+                    m_DialogModule.SendNotificationToUsersInRegion(m_Initiator, "System", msg);
+            }
+
+            return currentAlert - nextAlert;
+        }
+
+        public void SetTimer(int intervalSeconds)
+        {
+            m_CountdownTimer = new Timer();
+            m_CountdownTimer.AutoReset = false;
+            m_CountdownTimer.Interval = intervalSeconds * 1000;
+            m_CountdownTimer.Elapsed += OnTimer;
+            m_CountdownTimer.Start();
+        }
+
+        private void OnTimer(object source, ElapsedEventArgs e)
+        {
+            int nextInterval = DoOneNotice();
+
+            SetTimer(nextInterval);
+        }
+
+        public void AbortRestart(string message)
+        {
+            if (m_CountdownTimer != null)
+            {
+                m_CountdownTimer.Stop();
+                m_CountdownTimer = null;
+            }
+        }
+    }
+}

OpenSim/Region/Framework/Interfaces/IRestartModule.cs

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenMetaverse;
+
+namespace OpenSim.Region.Framework.Interfaces
+{
+    public interface IRestartModule
+    {
+        TimeSpan TimeUntilRestart { get; }
+        void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice);
+        void AbortRestart(string message);
+    }
+}

OpenSim/Region/Physics/Meshing/Meshmerizer.cs

@@ -276,7 +276,7 @@ namespace OpenSim.Region.Physics.Meshing
 
                     m_log.Debug("[MESH]: experimental mesh proxy generation");
 
-                    OSD meshOsd;
+                    OSD meshOsd = null;
 
                     if (primShape.SculptData.Length <= 0)
                     {
@@ -286,8 +286,15 @@ namespace OpenSim.Region.Physics.Meshing
 
                     long start = 0;
                     using (MemoryStream data = new MemoryStream(primShape.SculptData))
+                    {
+                        try
                         {
                             meshOsd = (OSDMap)OSDParser.DeserializeLLSDBinary(data);
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.Error("[MESH]: Exception deserializing mesh asset header:" + e.ToString());
+                        }
                         start = data.Position;
                     }