From b5ec101cc8af2a4b3313ba7466b79b5fa6961c95 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 23 Apr 2010 12:05:10 -0700
Subject: add a comment about deprecating IRegionModule
---
OpenSim/Region/Framework/Interfaces/IRegionModule.cs | 3 +++
1 file changed, 3 insertions(+)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
index 8eb906c..8365fe3 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
@@ -30,6 +30,9 @@ using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Framework.Interfaces
{
+ ///
+ /// DEPRECATED! Use INonSharedRegionModule or ISharedRegionModule instead
+ ///
public interface IRegionModule
{
void Initialise(Scene scene, IConfigSource source);
--
cgit v1.1
From 10e18f465e0540e9d09d47462c8166cb60a38426 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Apr 2010 21:29:09 +0100
Subject: minor: eliminate configuration section handling deprecation of
OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long
time
---
OpenSim/Region/Application/ConfigurationLoader.cs | 6 ------
1 file changed, 6 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 4ca6595..cac5fa9 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -349,12 +349,6 @@ namespace OpenSim
m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
m_configSettings.StorageDll = startupConfig.GetString("storage_plugin");
- if (m_configSettings.StorageDll == "OpenSim.DataStore.MonoSqlite.dll")
- {
- m_configSettings.StorageDll = "OpenSim.Data.SQLite.dll";
- m_log.Warn("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll.");
- Thread.Sleep(3000);
- }
m_configSettings.StorageConnectionString
= startupConfig.GetString("storage_connection_string");
--
cgit v1.1
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')
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
{
- ///
- /// DEPRECATED! Use INonSharedRegionModule or ISharedRegionModule instead
+ ///
+ /// DEPRECATED! Use INonSharedRegionModule or ISharedRegionModule instead
///
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
---
.../Framework/Interfaces/IEntityInventory.cs | 1 +
.../Framework/Scenes/SceneObjectPartInventory.cs | 43 +++++++++++++---------
2 files changed, 26 insertions(+), 18 deletions(-)
(limited to 'OpenSim/Region')
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.
/// false if the item did not exist, true if the update occurred successfully
bool UpdateInventoryItem(TaskInventoryItem item);
+ bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents);
///
/// Remove an item from this entity's inventory
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 3b1b567..44c49c5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -609,30 +609,37 @@ namespace OpenSim.Region.Framework.Scenes
/// false if the item did not exist, true if the update occurred successfully
public bool UpdateInventoryItem(TaskInventoryItem item)
{
- lock (m_items)
+ return UpdateInventoryItem(item, true);
+ }
+
+ public bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents)
+ {
+ lock(m_items)
{
if (m_items.ContainsKey(item.ItemID))
{
- item.ParentID = m_part.UUID;
- item.ParentPartID = m_part.UUID;
- item.Flags = m_items[item.ItemID].Flags;
-
- // If group permissions have been set on, check that the groupID is up to date in case it has
- // changed since permissions were last set.
- if (item.GroupPermissions != (uint)PermissionMask.None)
- item.GroupID = m_part.GroupID;
-
- if (item.AssetID == UUID.Zero)
+ if (m_items.ContainsKey(item.ItemID))
{
- item.AssetID = m_items[item.ItemID].AssetID;
- }
-
+ item.ParentID = m_part.UUID;
+ item.ParentPartID = m_part.UUID;
+ item.Flags = m_items[item.ItemID].Flags;
+
+ // If group permissions have been set on, check that the groupID is up to date in case it has
+ // changed since permissions were last set.
+ if (item.GroupPermissions != (uint)PermissionMask.None)
+ item.GroupID = m_part.GroupID;
+
+ if (item.AssetID == UUID.Zero)
+ {
+ item.AssetID = m_items[item.ItemID].AssetID;
+ }
m_items[item.ItemID] = item;
m_inventorySerial++;
- m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
+ if (fireScriptEvents)
+ m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
HasInventoryChanged = true;
m_part.ParentGroup.HasGroupChanged = true;
-
+ m_items.LockItemsForWrite(false);
return true;
}
else
@@ -643,9 +650,9 @@ namespace OpenSim.Region.Framework.Scenes
item.ItemID, m_part.Name, m_part.UUID,
m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
}
- }
- return false;
+ return false;
+ }
}
///
--
cgit v1.1