4 files changed, 115 insertions, 108 deletions

diff --git a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs
index 2db718c..f9e118b 100644
--- a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs
+++ b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs
@@ -23,104 +23,104 @@
  * 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.Collections.Generic;

-

-

-namespace OpenSim.Region.OptionalModules.World.AutoBackup

-{

-    /// <summary>AutoBackupModuleState: Auto-Backup state for one region (scene).

-    /// If you use this class in any way outside of AutoBackupModule, you should treat the class as opaque.

-    /// Since it is not part of the framework, you really should not rely upon it outside of the AutoBackupModule implementation.

-    /// </summary>

-    /// 

-    public class AutoBackupModuleState

-    {

-        private Dictionary<Guid, string> m_liveRequests = null;

-

-        public AutoBackupModuleState()

-        {

-            this.Enabled = false;

-            this.BackupDir = ".";

-            this.BusyCheck = true;

-            this.Timer = null;

-            this.NamingType = NamingType.Time;

-            this.Script = null;

-        }

-

-        public Dictionary<Guid, string> LiveRequests

-        {

-            get {

-                return this.m_liveRequests ??

-                       (this.m_liveRequests = new Dictionary<Guid, string>(1));

-            }

-        }

-

-        public bool Enabled

-        {

-            get;

-            set;

-        }

-

-        public System.Timers.Timer Timer

-        {

-            get;

-            set;

-        }

-

-        public double IntervalMinutes

-        {

-            get

-            {

-                if (this.Timer == null)

-                {

-                    return -1.0;

-                }

-                else

-                {

-                    return this.Timer.Interval / 60000.0;

-                }

-            }

-        }

-

-        public bool BusyCheck

-        {

-            get;

-            set;

-        }

-

-        public string Script

-        {

-            get;

-            set;

-        }

-

-        public string BackupDir

-        {

-            get;

-            set;

-        }

-

-        public NamingType NamingType

-        {

-            get;

-            set;

-        }

-

-        public new string ToString()

-        {

-            string retval = "";

-

-            retval += "[AUTO BACKUP]: AutoBackup: " + (Enabled ? "ENABLED" : "DISABLED") + "\n";

-            retval += "[AUTO BACKUP]: Interval: " + IntervalMinutes + " minutes" + "\n";

-            retval += "[AUTO BACKUP]: Do Busy Check: " + (BusyCheck ? "Yes" : "No") + "\n";

-            retval += "[AUTO BACKUP]: Naming Type: " + NamingType.ToString() + "\n";

-            retval += "[AUTO BACKUP]: Backup Dir: " + BackupDir + "\n";

-            retval += "[AUTO BACKUP]: Script: " + Script + "\n";

-            return retval;

-        }

-    }

-}

-

+ */
+
+using System;
+using System.Collections.Generic;
+
+
+namespace OpenSim.Region.OptionalModules.World.AutoBackup
+{
+    /// <summary>AutoBackupModuleState: Auto-Backup state for one region (scene).
+    /// If you use this class in any way outside of AutoBackupModule, you should treat the class as opaque.
+    /// Since it is not part of the framework, you really should not rely upon it outside of the AutoBackupModule implementation.
+    /// </summary>
+    /// 
+    public class AutoBackupModuleState
+    {
+        private Dictionary<Guid, string> m_liveRequests = null;
+
+        public AutoBackupModuleState()
+        {
+            this.Enabled = false;
+            this.BackupDir = ".";
+            this.BusyCheck = true;
+            this.Timer = null;
+            this.NamingType = NamingType.Time;
+            this.Script = null;
+        }
+
+        public Dictionary<Guid, string> LiveRequests
+        {
+            get {
+                return this.m_liveRequests ??
+                       (this.m_liveRequests = new Dictionary<Guid, string>(1));
+            }
+        }
+
+        public bool Enabled
+        {
+            get;
+            set;
+        }
+
+        public System.Timers.Timer Timer
+        {
+            get;
+            set;
+        }
+
+        public double IntervalMinutes
+        {
+            get
+            {
+                if (this.Timer == null)
+                {
+                    return -1.0;
+                }
+                else
+                {
+                    return this.Timer.Interval / 60000.0;
+                }
+            }
+        }
+
+        public bool BusyCheck
+        {
+            get;
+            set;
+        }
+
+        public string Script
+        {
+            get;
+            set;
+        }
+
+        public string BackupDir
+        {
+            get;
+            set;
+        }
+
+        public NamingType NamingType
+        {
+            get;
+            set;
+        }
+
+        public new string ToString()
+        {
+            string retval = "";
+
+            retval += "[AUTO BACKUP]: AutoBackup: " + (Enabled ? "ENABLED" : "DISABLED") + "\n";
+            retval += "[AUTO BACKUP]: Interval: " + IntervalMinutes + " minutes" + "\n";
+            retval += "[AUTO BACKUP]: Do Busy Check: " + (BusyCheck ? "Yes" : "No") + "\n";
+            retval += "[AUTO BACKUP]: Naming Type: " + NamingType.ToString() + "\n";
+            retval += "[AUTO BACKUP]: Backup Dir: " + BackupDir + "\n";
+            retval += "[AUTO BACKUP]: Script: " + Script + "\n";
+            return retval;
+        }
+    }
+}
+
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index b84a34d..d469548 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -838,6 +838,10 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
             if (module != null)
                 module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice);
         }
+
+        public void MoveMoney(UUID fromAgentID, UUID toAgentID, int amount, string text)
+        {
+        }
     }
 
     public enum TransactionType : int
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index edb618e..253fdee 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -157,7 +157,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
 #pragma warning disable 67
         public event Action<IClientAPI> OnLogout;
         public event ObjectPermissions OnObjectPermissions;
-
+        public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
         public event MoneyTransferRequest OnMoneyTransferRequest;
         public event ParcelBuy OnParcelBuy;
         public event Action<IClientAPI> OnConnectionClosed;
@@ -361,7 +361,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public event ClassifiedInfoRequest OnClassifiedInfoRequest;
         public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
         public event ClassifiedDelete OnClassifiedDelete;
-        public event ClassifiedDelete OnClassifiedGodDelete;
+        public event ClassifiedGodDelete OnClassifiedGodDelete;
 
         public event EventNotificationAddRequest OnEventNotificationAddRequest;
         public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
@@ -520,7 +520,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
 
         }
 
-        public virtual void SendKillObject(ulong regionHandle, uint localID)
+        public virtual void SendKillObject(ulong regionHandle, List<uint> localID)
         {
         }
 
@@ -837,8 +837,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
 
         public void Close()
         {
-            // Remove ourselves from the scene
-            m_scene.RemoveClient(AgentId, false);
+            Close(true);
+        }
+
+        public void Close(bool sendStop)
+        {
         }
 
         public void Start()
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
index feca7d3..38c2f7b 100644
--- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
@@ -385,7 +385,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
                         m_scene.ForEachClient(delegate(IClientAPI controller)
                         {
                             controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
-                                                      selectedTree.LocalId);
+                                                      new List<uint>() { selectedTree.LocalId });
                         });
                     }
                     else
@@ -726,7 +726,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
                                 m_scene.ForEachClient(delegate(IClientAPI controller)
                                                           {
                                                               controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
-                                                                                        selectedTree.LocalId);
+                                                                                        new List<uint>() { selectedTree.LocalId });
                                                           });
 
                                 break;