From 2ac00b7f96b01cf9494d2a5fef9a84443301a04c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 26 Apr 2010 14:52:22 -0700
Subject: * Commenting SQLiteNG out of prebuild.xml, because it's making
 compile fail in Windows. Justin: you forgot to add Mono.Sqlite.dll, and I
 can't figure out where to grab it from! * IRegionModule.cs wants to be
 committed too -- EOF.

---
 OpenSim/Region/Framework/Interfaces/IRegionModule.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Interfaces')

diff --git a/OpenSim/Region/Framework/Interfaces/IRegionModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
index 8365fe3..e25a6e8 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
@@ -30,8 +30,8 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
-    /// <summary>
-    /// DEPRECATED! Use INonSharedRegionModule or ISharedRegionModule instead
+    /// <summary>
+    /// DEPRECATED! Use INonSharedRegionModule or ISharedRegionModule instead
     /// </summary>
     public interface IRegionModule
     {
-- 
cgit v1.1


From 6928ec024060bb7181553206c9ee6a125e7c9a2d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 27 Apr 2010 00:25:29 +0100
Subject: Add a parameter to prim inventory update to prevent event firing

---
 OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Region/Framework/Interfaces')

diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 2b90960..fd43923 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -161,6 +161,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// in this prim's inventory.</param>
         /// <returns>false if the item did not exist, true if the update occurred successfully</returns>
         bool UpdateInventoryItem(TaskInventoryItem item);
+        bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents);
 
         /// <summary>
         /// Remove an item from this entity's inventory
-- 
cgit v1.1