From 61f63fdc38a4108305a833f56d9fd82d35c5d564 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 31 Dec 2009 23:51:53 +0000
Subject: Put PassCollision on the ignore list for testing, since we don't save
that yet.
---
OpenSim/Data/Tests/BasicRegionTest.cs | 1 +
1 file changed, 1 insertion(+)
(limited to 'OpenSim/Data')
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index f76962c..676c6ba 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -577,6 +577,7 @@ namespace OpenSim.Data.Tests
.IgnoreProperty(x=>x.RegionUUID)
.IgnoreProperty(x=>x.Scene)
.IgnoreProperty(x=>x.Children)
+ .IgnoreProperty(x=>x.PassCollision)
.IgnoreProperty(x=>x.RootPart));
}
--
cgit v1.1
From 0d9591bf3562955a39c57dd289d0cc0bb0ba85a3 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 1 Jan 2010 22:51:00 +0000
Subject: Prevent the creation of duplicate inventory folders in the case of a
login database issue. Now the login will instaead fail later.
---
OpenSim/Data/MySQL/MySQLInventoryData.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Data')
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index d560c5f..f7b286f 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -264,7 +264,7 @@ namespace OpenSim.Data.MySQL
{
database.Reconnect();
m_log.Error(e.ToString());
- return null;
+ throw;
}
}
--
cgit v1.1
From 70d5b1c34cf2eb6621f383169fdee03966850762 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Mon, 4 Jan 2010 06:10:45 +0900
Subject: Formatting cleanup. Add copyright headers.
---
OpenSim/Data/MySQL/MySQLInventoryData.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Data')
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index f7b286f..f566fde 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Data.MySQL
rollbackStore = GridDataMySqlFile.ParseFileReadValue("rollback") == "true";
opengridmode = GridDataMySqlFile.ParseFileReadValue("opengridmode") == "true";
- if(rollbackStore)
+ if (rollbackStore)
m_log.Warn("[MysqlInventory] Enabling rollback mode in: " + rollbackDir);
database =
@@ -552,7 +552,7 @@ namespace OpenSim.Data.MySQL
private void StoreRollbackItem(UUID ItemID)
{
- if(rollbackStore == true)
+ if (rollbackStore == true)
{
string todaysPath = RollbackGetTodaysPath();
@@ -1008,7 +1008,7 @@ namespace OpenSim.Data.MySQL
StoreRollbackFolder(f.ID);
deleteOneFolder(f.ID);
- if(rollbackStore)
+ if (rollbackStore)
{
foreach (InventoryItemBase itemBase in getInventoryInFolder(f.ID))
{
--
cgit v1.1
From e76333555d2016412b17f43039962d32ad8c0609 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 4 Jan 2010 18:47:47 +0000
Subject: First stage port of the XInventoryService
---
OpenSim/Data/IXInventoryData.cs | 82 ++++++++++++++++++
OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | 5 ++
OpenSim/Data/MySQL/MySQLXInventoryData.cs | 113 +++++++++++++++++++++++++
3 files changed, 200 insertions(+)
create mode 100644 OpenSim/Data/IXInventoryData.cs
create mode 100644 OpenSim/Data/MySQL/MySQLXInventoryData.cs
(limited to 'OpenSim/Data')
diff --git a/OpenSim/Data/IXInventoryData.cs b/OpenSim/Data/IXInventoryData.cs
new file mode 100644
index 0000000..88174d9
--- /dev/null
+++ b/OpenSim/Data/IXInventoryData.cs
@@ -0,0 +1,82 @@
+/*
+ * 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.Collections.Generic;
+using OpenMetaverse;
+using OpenSim.Framework;
+
+namespace OpenSim.Data
+{
+ public class XInventoryFolder
+ {
+ public string folderName;
+ public int type;
+ public int version;
+ public UUID folderID;
+ public UUID agentID;
+ public UUID parentFolderID;
+ }
+
+ public class XInventoryItem
+ {
+ public UUID assetID;
+ public int assetType;
+ public string inventoryName;
+ public string inventoryDescription;
+ public int inventoryNextPermissions;
+ public int inventoryCurrentPermissions;
+ public int invType;
+ public UUID creatorID;
+ public int inventoryBasePermissions;
+ public int inventoryEveryOnePermissions;
+ public int salePrice;
+ public int saleType;
+ public int creationDate;
+ public UUID groupID;
+ public bool groupOwned;
+ public int flags;
+ public UUID inventoryID;
+ public UUID avatarID;
+ public UUID parentFolderID;
+ public int inventoryGroupPermissions;
+ }
+
+ public interface IXInventoryData
+ {
+ XInventoryFolder[] GetFolders(string[] fields, string[] vals);
+ XInventoryItem[] GetItems(string[] fields, string[] vals);
+
+ bool StoreFolder(XInventoryFolder folder);
+ bool StoreItem(XInventoryItem item);
+
+ bool DeleteFolders(string field, string val);
+ bool DeleteItems(string field, string val);
+
+ bool MoveItem(string principalID, string id, string newParent);
+ }
+}
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index b2bd5f6..fdb98eb 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -153,6 +153,11 @@ namespace OpenSim.Data.MySQL
UUID.TryParse(reader[name].ToString(), out uuid);
m_Fields[name].SetValue(row, uuid);
}
+ else if (m_Fields[name].GetValue(row) is int)
+ {
+ int v = Convert.ToInt32(reader[name]);
+ m_Fields[name].SetValue(row, v);
+ }
else
{
m_Fields[name].SetValue(row, reader[name]);
diff --git a/OpenSim/Data/MySQL/MySQLXInventoryData.cs b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
new file mode 100644
index 0000000..dd3e6ea
--- /dev/null
+++ b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
@@ -0,0 +1,113 @@
+/*
+ * 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.Data;
+using System.Reflection;
+using System.Collections.Generic;
+using log4net;
+using MySql.Data.MySqlClient;
+using OpenMetaverse;
+using OpenSim.Framework;
+
+namespace OpenSim.Data.MySQL
+{
+ ///
+ /// A MySQL Interface for the Asset Server
+ ///
+ public class MySQLXInventoryData : IXInventoryData
+ {
+ private static readonly ILog m_log = LogManager.GetLogger(
+ MethodBase.GetCurrentMethod().DeclaringType);
+
+ private MySQLGenericTableHandler m_Folders;
+ private MySqlItemHandler m_Items;
+
+ public MySQLXInventoryData(string conn, string realm)
+ {
+ m_Folders = new MySQLGenericTableHandler(
+ conn, "inventoryfolders", "InventoryStore");
+ m_Items = new MySqlItemHandler(
+ conn, "inventoryitems", String.Empty);
+ }
+
+ public XInventoryFolder[] GetFolders(string[] fields, string[] vals)
+ {
+ return m_Folders.Get(fields, vals);
+ }
+
+ public XInventoryItem[] GetItems(string[] fields, string[] vals)
+ {
+ return m_Items.Get(fields, vals);
+ }
+
+ public bool StoreFolder(XInventoryFolder folder)
+ {
+ return m_Folders.Store(folder);
+ }
+
+ public bool StoreItem(XInventoryItem item)
+ {
+ return m_Items.Store(item);
+ }
+
+ public bool DeleteFolders(string field, string val)
+ {
+ return m_Folders.Delete(field, val);
+ }
+
+ public bool DeleteItems(string field, string val)
+ {
+ return m_Items.Delete(field, val);
+ }
+
+ public bool MoveItem(string principalID, string id, string newParent)
+ {
+ return m_Items.MoveItem(principalID, id, newParent);
+ }
+ }
+
+ public class MySqlItemHandler : MySQLGenericTableHandler
+ {
+ public MySqlItemHandler(string c, string t, string m) :
+ base(c, t, m)
+ {
+ }
+
+ public bool MoveItem(string principalID, string id, string newParent)
+ {
+ MySqlCommand cmd = new MySqlCommand();
+
+ cmd.CommandText = String.Format("update {0} set parentFolderID = ?ParentFolderID where agentID = ?AgentID and folderID = ?FolderID");
+ cmd.Parameters.AddWithValue("?ParentFolderID", newParent);
+ cmd.Parameters.AddWithValue("?FolderID", id);
+ cmd.Parameters.AddWithValue("?AgentID", principalID);
+
+ return ExecuteNonQuery(cmd) == 0 ? false : true;
+ }
+ }
+}
--
cgit v1.1
From 1ae9bfc0746b97f57031f282d4f6721b08c27f0c Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 4 Jan 2010 20:52:44 +0000
Subject: Finish conversion if XInventoryService
---
OpenSim/Data/IXInventoryData.cs | 4 ++-
OpenSim/Data/MySQL/MySQLXInventoryData.cs | 55 +++++++++++++++++++++++++++----
2 files changed, 52 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Data')
diff --git a/OpenSim/Data/IXInventoryData.cs b/OpenSim/Data/IXInventoryData.cs
index 88174d9..cd9273e 100644
--- a/OpenSim/Data/IXInventoryData.cs
+++ b/OpenSim/Data/IXInventoryData.cs
@@ -77,6 +77,8 @@ namespace OpenSim.Data
bool DeleteFolders(string field, string val);
bool DeleteItems(string field, string val);
- bool MoveItem(string principalID, string id, string newParent);
+ bool MoveItem(string id, string newParent);
+ XInventoryItem[] GetActiveGestures(UUID principalID);
+ int GetAssetPermissions(UUID principalID, UUID assetID);
}
}
diff --git a/OpenSim/Data/MySQL/MySQLXInventoryData.cs b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
index dd3e6ea..0eebc9c 100644
--- a/OpenSim/Data/MySQL/MySQLXInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
@@ -85,9 +85,19 @@ namespace OpenSim.Data.MySQL
return m_Items.Delete(field, val);
}
- public bool MoveItem(string principalID, string id, string newParent)
+ public bool MoveItem(string id, string newParent)
{
- return m_Items.MoveItem(principalID, id, newParent);
+ return m_Items.MoveItem(id, newParent);
+ }
+
+ public XInventoryItem[] GetActiveGestures(UUID principalID)
+ {
+ return m_Items.GetActiveGestures(principalID);
+ }
+
+ public int GetAssetPermissions(UUID principalID, UUID assetID)
+ {
+ return m_Items.GetAssetPermissions(principalID, assetID);
}
}
@@ -98,16 +108,49 @@ namespace OpenSim.Data.MySQL
{
}
- public bool MoveItem(string principalID, string id, string newParent)
+ public bool MoveItem(string id, string newParent)
{
MySqlCommand cmd = new MySqlCommand();
- cmd.CommandText = String.Format("update {0} set parentFolderID = ?ParentFolderID where agentID = ?AgentID and folderID = ?FolderID");
+ cmd.CommandText = String.Format("update {0} set parentFolderID = ?ParentFolderID where inventoryID = ?InventoryID", m_Realm);
cmd.Parameters.AddWithValue("?ParentFolderID", newParent);
- cmd.Parameters.AddWithValue("?FolderID", id);
- cmd.Parameters.AddWithValue("?AgentID", principalID);
+ cmd.Parameters.AddWithValue("?InventoryID", id);
return ExecuteNonQuery(cmd) == 0 ? false : true;
}
+
+ public XInventoryItem[] GetActiveGestures(UUID principalID)
+ {
+ MySqlCommand cmd = new MySqlCommand();
+ cmd.CommandText = String.Format("select * from inventoryitems where avatarId = ?uuid and assetType = ?type and flags = 1", m_Realm);
+
+ cmd.Parameters.AddWithValue("?uuid", principalID.ToString());
+ cmd.Parameters.AddWithValue("?type", (int)AssetType.Gesture);
+
+ return DoQuery(cmd);
+ }
+
+ public int GetAssetPermissions(UUID principalID, UUID assetID)
+ {
+ MySqlCommand cmd = new MySqlCommand();
+
+ cmd.CommandText = String.Format("select bit_or(inventoryCurrentPermissions) as inventoryCurrentPermissions from inventoryitems where avatarID = ?PrincipalID and assetID = ?AssetID group by assetID", m_Realm);
+ cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
+ cmd.Parameters.AddWithValue("?AssetID", assetID.ToString());
+
+ IDataReader reader = ExecuteReader(cmd);
+
+ int perms = 0;
+
+ if (reader.Read())
+ {
+ perms = Convert.ToInt32(reader["inventoryCurrentPermissions"]);
+ }
+
+ reader.Close();
+ CloseReaderCommand(cmd);
+
+ return perms;
+ }
}
}
--
cgit v1.1