Merge branch 'master' into careminster
commit
e4659a83f1
|
@ -132,6 +132,11 @@
|
||||||
</exec>
|
</exec>
|
||||||
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" />
|
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" />
|
||||||
|
|
||||||
|
<exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.services.inventoryservice.tests">
|
||||||
|
<arg value="./bin/OpenSim.Services.InventoryService.Tests.dll" />
|
||||||
|
</exec>
|
||||||
|
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" />
|
||||||
|
|
||||||
<delete dir="%temp%"/>
|
<delete dir="%temp%"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
@ -235,6 +240,11 @@
|
||||||
<arg value="-xml=test-results/OpenSim.Capabilities.Handlers.Tests.dll-Results.xml" />
|
<arg value="-xml=test-results/OpenSim.Capabilities.Handlers.Tests.dll-Results.xml" />
|
||||||
</exec>
|
</exec>
|
||||||
|
|
||||||
|
<exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.services.inventoryservice.tests">
|
||||||
|
<arg value="./bin/OpenSim.Services.InventoryService.Tests.dll" />
|
||||||
|
<arg value="-xml=test-results/OpenSim.Services.InventoryService.Tests.dll-Results.xml" />
|
||||||
|
</exec>
|
||||||
|
|
||||||
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" />
|
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" />
|
||||||
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" />
|
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" />
|
||||||
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" />
|
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" />
|
||||||
|
@ -245,6 +255,7 @@
|
||||||
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" />
|
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" />
|
||||||
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" />
|
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" />
|
||||||
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" />
|
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" />
|
||||||
|
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" />
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="doxygen">
|
<target name="doxygen">
|
||||||
|
|
|
@ -2448,7 +2448,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
|
||||||
destinationItem.Description = item.Description;
|
destinationItem.Description = item.Description;
|
||||||
destinationItem.InvType = item.InvType;
|
destinationItem.InvType = item.InvType;
|
||||||
destinationItem.CreatorId = item.CreatorId;
|
destinationItem.CreatorId = item.CreatorId;
|
||||||
destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid;
|
|
||||||
destinationItem.CreatorData = item.CreatorData;
|
destinationItem.CreatorData = item.CreatorData;
|
||||||
destinationItem.NextPermissions = item.NextPermissions;
|
destinationItem.NextPermissions = item.NextPermissions;
|
||||||
destinationItem.CurrentPermissions = item.CurrentPermissions;
|
destinationItem.CurrentPermissions = item.CurrentPermissions;
|
||||||
|
@ -2503,7 +2502,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
|
||||||
destinationItem.Description = item.Description;
|
destinationItem.Description = item.Description;
|
||||||
destinationItem.InvType = item.InvType;
|
destinationItem.InvType = item.InvType;
|
||||||
destinationItem.CreatorId = item.CreatorId;
|
destinationItem.CreatorId = item.CreatorId;
|
||||||
destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid;
|
|
||||||
destinationItem.CreatorData = item.CreatorData;
|
destinationItem.CreatorData = item.CreatorData;
|
||||||
destinationItem.NextPermissions = item.NextPermissions;
|
destinationItem.NextPermissions = item.NextPermissions;
|
||||||
destinationItem.CurrentPermissions = item.CurrentPermissions;
|
destinationItem.CurrentPermissions = item.CurrentPermissions;
|
||||||
|
@ -2616,7 +2614,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
|
||||||
destinationItem.Description = item.Description;
|
destinationItem.Description = item.Description;
|
||||||
destinationItem.InvType = item.InvType;
|
destinationItem.InvType = item.InvType;
|
||||||
destinationItem.CreatorId = item.CreatorId;
|
destinationItem.CreatorId = item.CreatorId;
|
||||||
destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid;
|
|
||||||
destinationItem.CreatorData = item.CreatorData;
|
destinationItem.CreatorData = item.CreatorData;
|
||||||
destinationItem.NextPermissions = item.NextPermissions;
|
destinationItem.NextPermissions = item.NextPermissions;
|
||||||
destinationItem.CurrentPermissions = item.CurrentPermissions;
|
destinationItem.CurrentPermissions = item.CurrentPermissions;
|
||||||
|
@ -2922,7 +2919,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
|
||||||
inventoryItem.Description = GetStringAttribute(item,"desc","");
|
inventoryItem.Description = GetStringAttribute(item,"desc","");
|
||||||
inventoryItem.InvType = GetIntegerAttribute(item,"invtype",-1);
|
inventoryItem.InvType = GetIntegerAttribute(item,"invtype",-1);
|
||||||
inventoryItem.CreatorId = GetStringAttribute(item,"creatorid","");
|
inventoryItem.CreatorId = GetStringAttribute(item,"creatorid","");
|
||||||
inventoryItem.CreatorIdAsUuid = (UUID)GetStringAttribute(item,"creatoruuid","");
|
|
||||||
inventoryItem.CreatorData = GetStringAttribute(item, "creatordata", "");
|
inventoryItem.CreatorData = GetStringAttribute(item, "creatordata", "");
|
||||||
inventoryItem.NextPermissions = GetUnsignedAttribute(perms, "next", 0x7fffffff);
|
inventoryItem.NextPermissions = GetUnsignedAttribute(perms, "next", 0x7fffffff);
|
||||||
inventoryItem.CurrentPermissions = GetUnsignedAttribute(perms,"current",0x7fffffff);
|
inventoryItem.CurrentPermissions = GetUnsignedAttribute(perms,"current",0x7fffffff);
|
||||||
|
|
|
@ -122,7 +122,7 @@ namespace OpenSim.Data.MSSQL
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class MSSQLItemHandler : MSSQLGenericTableHandler<XInventoryItem>
|
public class MSSQLItemHandler : MSSQLInventoryHandler<XInventoryItem>
|
||||||
{
|
{
|
||||||
public MSSQLItemHandler(string c, string t, string m) :
|
public MSSQLItemHandler(string c, string t, string m) :
|
||||||
base(c, t, m)
|
base(c, t, m)
|
||||||
|
@ -213,43 +213,9 @@ namespace OpenSim.Data.MSSQL
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool IncrementFolderVersion(UUID folderID)
|
|
||||||
{
|
|
||||||
return IncrementFolderVersion(folderID.ToString());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool IncrementFolderVersion(string folderID)
|
public class MSSQLFolderHandler : MSSQLInventoryHandler<XInventoryFolder>
|
||||||
{
|
|
||||||
// m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
|
|
||||||
// Util.PrintCallStack();
|
|
||||||
|
|
||||||
string sql = "update inventoryfolders set version=version+1 where folderID = ?folderID";
|
|
||||||
|
|
||||||
using (SqlConnection conn = new SqlConnection(m_ConnectionString))
|
|
||||||
{
|
|
||||||
using (SqlCommand cmd = new SqlCommand(sql, conn))
|
|
||||||
{
|
|
||||||
conn.Open();
|
|
||||||
|
|
||||||
cmd.Parameters.AddWithValue("@folderID", folderID);
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
cmd.ExecuteNonQuery();
|
|
||||||
}
|
|
||||||
catch (Exception)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class MSSQLFolderHandler : MSSQLGenericTableHandler<XInventoryFolder>
|
|
||||||
{
|
{
|
||||||
public MSSQLFolderHandler(string c, string t, string m) :
|
public MSSQLFolderHandler(string c, string t, string m) :
|
||||||
base(c, t, m)
|
base(c, t, m)
|
||||||
|
@ -296,13 +262,18 @@ namespace OpenSim.Data.MSSQL
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private bool IncrementFolderVersion(UUID folderID)
|
public class MSSQLInventoryHandler<T> : MSSQLGenericTableHandler<T> where T: class, new()
|
||||||
|
{
|
||||||
|
public MSSQLInventoryHandler(string c, string t, string m) : base(c, t, m) {}
|
||||||
|
|
||||||
|
protected bool IncrementFolderVersion(UUID folderID)
|
||||||
{
|
{
|
||||||
return IncrementFolderVersion(folderID.ToString());
|
return IncrementFolderVersion(folderID.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool IncrementFolderVersion(string folderID)
|
protected bool IncrementFolderVersion(string folderID)
|
||||||
{
|
{
|
||||||
// m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
|
// m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
|
||||||
// Util.PrintCallStack();
|
// Util.PrintCallStack();
|
||||||
|
|
|
@ -122,7 +122,7 @@ namespace OpenSim.Data.MySQL
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class MySqlItemHandler : MySQLGenericTableHandler<XInventoryItem>
|
public class MySqlItemHandler : MySqlInventoryHandler<XInventoryItem>
|
||||||
{
|
{
|
||||||
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
|
@ -241,47 +241,9 @@ namespace OpenSim.Data.MySQL
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool IncrementFolderVersion(UUID folderID)
|
|
||||||
{
|
|
||||||
return IncrementFolderVersion(folderID.ToString());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool IncrementFolderVersion(string folderID)
|
public class MySqlFolderHandler : MySqlInventoryHandler<XInventoryFolder>
|
||||||
{
|
|
||||||
// m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
|
|
||||||
// Util.PrintCallStack();
|
|
||||||
|
|
||||||
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
|
|
||||||
{
|
|
||||||
dbcon.Open();
|
|
||||||
|
|
||||||
using (MySqlCommand cmd = new MySqlCommand())
|
|
||||||
{
|
|
||||||
cmd.Connection = dbcon;
|
|
||||||
|
|
||||||
cmd.CommandText = String.Format("update inventoryfolders set version=version+1 where folderID = ?folderID");
|
|
||||||
cmd.Parameters.AddWithValue("?folderID", folderID);
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
cmd.ExecuteNonQuery();
|
|
||||||
}
|
|
||||||
catch (Exception)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
cmd.Dispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
dbcon.Close();
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class MySqlFolderHandler : MySQLGenericTableHandler<XInventoryFolder>
|
|
||||||
{
|
{
|
||||||
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
|
@ -326,13 +288,18 @@ namespace OpenSim.Data.MySQL
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private bool IncrementFolderVersion(UUID folderID)
|
public class MySqlInventoryHandler<T> : MySQLGenericTableHandler<T> where T: class, new()
|
||||||
|
{
|
||||||
|
public MySqlInventoryHandler(string c, string t, string m) : base(c, t, m) {}
|
||||||
|
|
||||||
|
protected bool IncrementFolderVersion(UUID folderID)
|
||||||
{
|
{
|
||||||
return IncrementFolderVersion(folderID.ToString());
|
return IncrementFolderVersion(folderID.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool IncrementFolderVersion(string folderID)
|
protected bool IncrementFolderVersion(string folderID)
|
||||||
{
|
{
|
||||||
// m_log.DebugFormat("[MYSQL FOLDER HANDLER]: Incrementing version on folder {0}", folderID);
|
// m_log.DebugFormat("[MYSQL FOLDER HANDLER]: Incrementing version on folder {0}", folderID);
|
||||||
// Util.PrintCallStack();
|
// Util.PrintCallStack();
|
||||||
|
|
|
@ -130,7 +130,7 @@ namespace OpenSim.Data.SQLite
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class SqliteItemHandler : SQLiteGenericTableHandler<XInventoryItem>
|
public class SqliteItemHandler : SqliteInventoryHandler<XInventoryItem>
|
||||||
{
|
{
|
||||||
public SqliteItemHandler(string c, string t, string m) :
|
public SqliteItemHandler(string c, string t, string m) :
|
||||||
base(c, t, m)
|
base(c, t, m)
|
||||||
|
@ -243,37 +243,9 @@ namespace OpenSim.Data.SQLite
|
||||||
|
|
||||||
return perms;
|
return perms;
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool IncrementFolderVersion(UUID folderID)
|
|
||||||
{
|
|
||||||
return IncrementFolderVersion(folderID.ToString());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool IncrementFolderVersion(string folderID)
|
public class SqliteFolderHandler : SqliteInventoryHandler<XInventoryFolder>
|
||||||
{
|
|
||||||
// m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
|
|
||||||
// Util.PrintCallStack();
|
|
||||||
|
|
||||||
using (SqliteCommand cmd = new SqliteCommand())
|
|
||||||
{
|
|
||||||
cmd.CommandText = "update inventoryfolders set version=version+1 where folderID = ?folderID";
|
|
||||||
cmd.Parameters.Add(new SqliteParameter(":folderID", folderID));
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
cmd.ExecuteNonQuery();
|
|
||||||
}
|
|
||||||
catch (Exception)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class SqliteFolderHandler : SQLiteGenericTableHandler<XInventoryFolder>
|
|
||||||
{
|
{
|
||||||
public SqliteFolderHandler(string c, string t, string m) :
|
public SqliteFolderHandler(string c, string t, string m) :
|
||||||
base(c, t, m)
|
base(c, t, m)
|
||||||
|
@ -315,12 +287,18 @@ namespace OpenSim.Data.SQLite
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool IncrementFolderVersion(UUID folderID)
|
}
|
||||||
|
|
||||||
|
public class SqliteInventoryHandler<T> : SQLiteGenericTableHandler<T> where T: class, new()
|
||||||
|
{
|
||||||
|
public SqliteInventoryHandler(string c, string t, string m) : base(c, t, m) {}
|
||||||
|
|
||||||
|
protected bool IncrementFolderVersion(UUID folderID)
|
||||||
{
|
{
|
||||||
return IncrementFolderVersion(folderID.ToString());
|
return IncrementFolderVersion(folderID.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool IncrementFolderVersion(string folderID)
|
protected bool IncrementFolderVersion(string folderID)
|
||||||
{
|
{
|
||||||
// m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
|
// m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
|
||||||
// Util.PrintCallStack();
|
// Util.PrintCallStack();
|
||||||
|
|
|
@ -87,16 +87,7 @@ namespace OpenSim.Framework
|
||||||
protected string m_creatorId;
|
protected string m_creatorId;
|
||||||
|
|
||||||
/// <value>
|
/// <value>
|
||||||
/// The UUID for the creator. This may be different from the canonical CreatorId. This property is used
|
/// The CreatorId expressed as a UUID.tely
|
||||||
/// for communication with the client over the Second Life protocol, since that protocol can only understand
|
|
||||||
/// UUIDs. As this is a basic framework class, this means that both the string creator id and the uuid
|
|
||||||
/// reference have to be settable separately
|
|
||||||
///
|
|
||||||
/// Database plugins don't need to set this, it will be set by
|
|
||||||
/// upstream code (or set by the get accessor if left unset).
|
|
||||||
///
|
|
||||||
/// XXX: An alternative to having a separate uuid property would be to hash the CreatorId appropriately
|
|
||||||
/// every time there was communication with a UUID-only client. This may be much more expensive.
|
|
||||||
/// </value>
|
/// </value>
|
||||||
public UUID CreatorIdAsUuid
|
public UUID CreatorIdAsUuid
|
||||||
{
|
{
|
||||||
|
@ -109,20 +100,18 @@ namespace OpenSim.Framework
|
||||||
|
|
||||||
return m_creatorIdAsUuid;
|
return m_creatorIdAsUuid;
|
||||||
}
|
}
|
||||||
|
|
||||||
set
|
|
||||||
{
|
|
||||||
m_creatorIdAsUuid = value;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
protected UUID m_creatorIdAsUuid = UUID.Zero;
|
protected UUID m_creatorIdAsUuid = UUID.Zero;
|
||||||
|
|
||||||
protected string m_creatorData = string.Empty;
|
/// <summary>
|
||||||
|
/// Extended creator information of the form <profile url>;<name>
|
||||||
|
/// </summary>
|
||||||
public string CreatorData // = <profile url>;<name>
|
public string CreatorData // = <profile url>;<name>
|
||||||
{
|
{
|
||||||
get { return m_creatorData; }
|
get { return m_creatorData; }
|
||||||
set { m_creatorData = value; }
|
set { m_creatorData = value; }
|
||||||
}
|
}
|
||||||
|
protected string m_creatorData = string.Empty;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Used by the DB layer to retrieve / store the entire user identification.
|
/// Used by the DB layer to retrieve / store the entire user identification.
|
||||||
|
@ -162,7 +151,6 @@ namespace OpenSim.Framework
|
||||||
name = parts[2];
|
name = parts[2];
|
||||||
|
|
||||||
m_creatorData += ';' + name;
|
m_creatorData += ';' + name;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,56 +27,62 @@
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Reflection;
|
using System.Text;
|
||||||
using Nini.Config;
|
|
||||||
using OpenSim.Framework;
|
|
||||||
using OpenSim.Data;
|
|
||||||
using OpenSim.Services.Interfaces;
|
|
||||||
using OpenSim.Services.Base;
|
|
||||||
|
|
||||||
namespace OpenSim.Services.InventoryService
|
namespace OpenSim.Framework.Monitoring
|
||||||
{
|
{
|
||||||
public class InventoryServiceBase : ServiceBase
|
public class PercentageStat : Stat
|
||||||
{
|
{
|
||||||
protected IInventoryDataPlugin m_Database = null;
|
public long Antecedent { get; set; }
|
||||||
|
public long Consequent { get; set; }
|
||||||
|
|
||||||
public InventoryServiceBase(IConfigSource config) : base(config)
|
public override double Value
|
||||||
{
|
{
|
||||||
string dllName = String.Empty;
|
get
|
||||||
string connString = String.Empty;
|
{
|
||||||
|
// Asking for an update here means that the updater cannot access this value without infinite recursion.
|
||||||
|
// XXX: A slightly messy but simple solution may be to flick a flag so we can tell if this is being
|
||||||
|
// called by the pull action and just return the value.
|
||||||
|
if (StatType == StatType.Pull)
|
||||||
|
PullAction(this);
|
||||||
|
|
||||||
//
|
long c = Consequent;
|
||||||
// Try reading the [DatabaseService] section first, if it exists
|
|
||||||
//
|
// Avoid any chance of a multi-threaded divide-by-zero
|
||||||
IConfig dbConfig = config.Configs["DatabaseService"];
|
if (c == 0)
|
||||||
if (dbConfig != null)
|
return 0;
|
||||||
{
|
|
||||||
dllName = dbConfig.GetString("StorageProvider", String.Empty);
|
return (double)Antecedent / c * 100;
|
||||||
connString = dbConfig.GetString("ConnectionString", String.Empty);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
set
|
||||||
// Try reading the more specific [InventoryService] section, if it exists
|
|
||||||
//
|
|
||||||
IConfig inventoryConfig = config.Configs["InventoryService"];
|
|
||||||
if (inventoryConfig != null)
|
|
||||||
{
|
{
|
||||||
dllName = inventoryConfig.GetString("StorageProvider", dllName);
|
throw new InvalidOperationException("Cannot set value on a PercentageStat");
|
||||||
connString = inventoryConfig.GetString("ConnectionString", connString);
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
public PercentageStat(
|
||||||
// We tried, but this doesn't exist. We can't proceed.
|
string shortName,
|
||||||
//
|
string name,
|
||||||
if (dllName.Equals(String.Empty))
|
string description,
|
||||||
throw new Exception("No InventoryService configuration");
|
string category,
|
||||||
|
string container,
|
||||||
|
StatType type,
|
||||||
|
Action<Stat> pullAction,
|
||||||
|
StatVerbosity verbosity)
|
||||||
|
: base(shortName, name, description, "%", category, container, type, pullAction, verbosity) {}
|
||||||
|
|
||||||
m_Database = LoadPlugin<IInventoryDataPlugin>(dllName);
|
public override string ToConsoleString()
|
||||||
if (m_Database == null)
|
{
|
||||||
throw new Exception("Could not find a storage interface in the given module");
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
m_Database.Initialise(connString);
|
sb.AppendFormat(
|
||||||
|
"{0}.{1}.{2} : {3:0.##}{4} ({5}/{6})",
|
||||||
|
Category, Container, ShortName, Value, UnitName, Antecedent, Consequent);
|
||||||
|
|
||||||
|
AppendMeasuresOfInterest(sb);
|
||||||
|
|
||||||
|
return sb.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -0,0 +1,238 @@
|
||||||
|
/*
|
||||||
|
* 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 System.Text;
|
||||||
|
|
||||||
|
namespace OpenSim.Framework.Monitoring
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Holds individual statistic details
|
||||||
|
/// </summary>
|
||||||
|
public class Stat
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Category of this stat (e.g. cache, scene, etc).
|
||||||
|
/// </summary>
|
||||||
|
public string Category { get; private set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Containing name for this stat.
|
||||||
|
/// FIXME: In the case of a scene, this is currently the scene name (though this leaves
|
||||||
|
/// us with a to-be-resolved problem of non-unique region names).
|
||||||
|
/// </summary>
|
||||||
|
/// <value>
|
||||||
|
/// The container.
|
||||||
|
/// </value>
|
||||||
|
public string Container { get; private set; }
|
||||||
|
|
||||||
|
public StatType StatType { get; private set; }
|
||||||
|
|
||||||
|
public MeasuresOfInterest MeasuresOfInterest { get; private set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Action used to update this stat when the value is requested if it's a pull type.
|
||||||
|
/// </summary>
|
||||||
|
public Action<Stat> PullAction { get; private set; }
|
||||||
|
|
||||||
|
public StatVerbosity Verbosity { get; private set; }
|
||||||
|
public string ShortName { get; private set; }
|
||||||
|
public string Name { get; private set; }
|
||||||
|
public string Description { get; private set; }
|
||||||
|
public virtual string UnitName { get; private set; }
|
||||||
|
|
||||||
|
public virtual double Value
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
// Asking for an update here means that the updater cannot access this value without infinite recursion.
|
||||||
|
// XXX: A slightly messy but simple solution may be to flick a flag so we can tell if this is being
|
||||||
|
// called by the pull action and just return the value.
|
||||||
|
if (StatType == StatType.Pull)
|
||||||
|
PullAction(this);
|
||||||
|
|
||||||
|
return m_value;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
m_value = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private double m_value;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Historical samples for calculating measures of interest average.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Will be null if no measures of interest require samples.
|
||||||
|
/// </remarks>
|
||||||
|
private static Queue<double> m_samples;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Maximum number of statistical samples.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// At the moment this corresponds to 1 minute since the sampling rate is every 2.5 seconds as triggered from
|
||||||
|
/// the main Watchdog.
|
||||||
|
/// </remarks>
|
||||||
|
private static int m_maxSamples = 24;
|
||||||
|
|
||||||
|
public Stat(
|
||||||
|
string shortName,
|
||||||
|
string name,
|
||||||
|
string description,
|
||||||
|
string unitName,
|
||||||
|
string category,
|
||||||
|
string container,
|
||||||
|
StatType type,
|
||||||
|
Action<Stat> pullAction,
|
||||||
|
StatVerbosity verbosity)
|
||||||
|
: this(
|
||||||
|
shortName,
|
||||||
|
name,
|
||||||
|
description,
|
||||||
|
unitName,
|
||||||
|
category,
|
||||||
|
container,
|
||||||
|
type,
|
||||||
|
MeasuresOfInterest.None,
|
||||||
|
pullAction,
|
||||||
|
verbosity)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Constructor
|
||||||
|
/// </summary>
|
||||||
|
/// <param name='shortName'>Short name for the stat. Must not contain spaces. e.g. "LongFrames"</param>
|
||||||
|
/// <param name='name'>Human readable name for the stat. e.g. "Long frames"</param>
|
||||||
|
/// <param name='description'>Description of stat</param>
|
||||||
|
/// <param name='unitName'>
|
||||||
|
/// Unit name for the stat. Should be preceeded by a space if the unit name isn't normally appeneded immediately to the value.
|
||||||
|
/// e.g. " frames"
|
||||||
|
/// </param>
|
||||||
|
/// <param name='category'>Category under which this stat should appear, e.g. "scene". Do not capitalize.</param>
|
||||||
|
/// <param name='container'>Entity to which this stat relates. e.g. scene name if this is a per scene stat.</param>
|
||||||
|
/// <param name='type'>Push or pull</param>
|
||||||
|
/// <param name='pullAction'>Pull stats need an action to update the stat on request. Push stats should set null here.</param>
|
||||||
|
/// <param name='moi'>Measures of interest</param>
|
||||||
|
/// <param name='verbosity'>Verbosity of stat. Controls whether it will appear in short stat display or only full display.</param>
|
||||||
|
public Stat(
|
||||||
|
string shortName,
|
||||||
|
string name,
|
||||||
|
string description,
|
||||||
|
string unitName,
|
||||||
|
string category,
|
||||||
|
string container,
|
||||||
|
StatType type,
|
||||||
|
MeasuresOfInterest moi,
|
||||||
|
Action<Stat> pullAction,
|
||||||
|
StatVerbosity verbosity)
|
||||||
|
{
|
||||||
|
if (StatsManager.SubCommands.Contains(category))
|
||||||
|
throw new Exception(
|
||||||
|
string.Format("Stat cannot be in category '{0}' since this is reserved for a subcommand", category));
|
||||||
|
|
||||||
|
ShortName = shortName;
|
||||||
|
Name = name;
|
||||||
|
Description = description;
|
||||||
|
UnitName = unitName;
|
||||||
|
Category = category;
|
||||||
|
Container = container;
|
||||||
|
StatType = type;
|
||||||
|
|
||||||
|
if (StatType == StatType.Push && pullAction != null)
|
||||||
|
throw new Exception("A push stat cannot have a pull action");
|
||||||
|
else
|
||||||
|
PullAction = pullAction;
|
||||||
|
|
||||||
|
MeasuresOfInterest = moi;
|
||||||
|
|
||||||
|
if ((moi & MeasuresOfInterest.AverageChangeOverTime) == MeasuresOfInterest.AverageChangeOverTime)
|
||||||
|
m_samples = new Queue<double>(m_maxSamples);
|
||||||
|
|
||||||
|
Verbosity = verbosity;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Record a value in the sample set.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Do not call this if MeasuresOfInterest.None
|
||||||
|
/// </remarks>
|
||||||
|
public void RecordValue()
|
||||||
|
{
|
||||||
|
double newValue = Value;
|
||||||
|
|
||||||
|
lock (m_samples)
|
||||||
|
{
|
||||||
|
if (m_samples.Count >= m_maxSamples)
|
||||||
|
m_samples.Dequeue();
|
||||||
|
|
||||||
|
m_samples.Enqueue(newValue);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string ToConsoleString()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
sb.AppendFormat("{0}.{1}.{2} : {3}{4}", Category, Container, ShortName, Value, UnitName);
|
||||||
|
|
||||||
|
AppendMeasuresOfInterest(sb);
|
||||||
|
|
||||||
|
return sb.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void AppendMeasuresOfInterest(StringBuilder sb)
|
||||||
|
{
|
||||||
|
if ((MeasuresOfInterest & MeasuresOfInterest.AverageChangeOverTime)
|
||||||
|
== MeasuresOfInterest.AverageChangeOverTime)
|
||||||
|
{
|
||||||
|
double totalChange = 0;
|
||||||
|
double? lastSample = null;
|
||||||
|
|
||||||
|
lock (m_samples)
|
||||||
|
{
|
||||||
|
foreach (double s in m_samples)
|
||||||
|
{
|
||||||
|
if (lastSample != null)
|
||||||
|
totalChange += s - (double)lastSample;
|
||||||
|
|
||||||
|
lastSample = s;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int divisor = m_samples.Count <= 1 ? 1 : m_samples.Count - 1;
|
||||||
|
|
||||||
|
sb.AppendFormat(", {0:0.##}{1}/s", totalChange / divisor / (Watchdog.WATCHDOG_INTERVAL_MS / 1000), UnitName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -27,6 +27,7 @@
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
namespace OpenSim.Framework.Monitoring
|
namespace OpenSim.Framework.Monitoring
|
||||||
{
|
{
|
||||||
|
@ -246,6 +247,24 @@ namespace OpenSim.Framework.Monitoring
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void RecordStats()
|
||||||
|
{
|
||||||
|
lock (RegisteredStats)
|
||||||
|
{
|
||||||
|
foreach (Dictionary<string, Dictionary<string, Stat>> category in RegisteredStats.Values)
|
||||||
|
{
|
||||||
|
foreach (Dictionary<string, Stat> container in category.Values)
|
||||||
|
{
|
||||||
|
foreach (Stat stat in container.Values)
|
||||||
|
{
|
||||||
|
if (stat.MeasuresOfInterest != MeasuresOfInterest.None)
|
||||||
|
stat.RecordValue();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -261,6 +280,16 @@ namespace OpenSim.Framework.Monitoring
|
||||||
Pull
|
Pull
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Measures of interest for this stat.
|
||||||
|
/// </summary>
|
||||||
|
[Flags]
|
||||||
|
public enum MeasuresOfInterest
|
||||||
|
{
|
||||||
|
None,
|
||||||
|
AverageChangeOverTime
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Verbosity of stat.
|
/// Verbosity of stat.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -272,160 +301,4 @@ namespace OpenSim.Framework.Monitoring
|
||||||
Debug,
|
Debug,
|
||||||
Info
|
Info
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Holds individual static details
|
|
||||||
/// </summary>
|
|
||||||
public class Stat
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Category of this stat (e.g. cache, scene, etc).
|
|
||||||
/// </summary>
|
|
||||||
public string Category { get; private set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Containing name for this stat.
|
|
||||||
/// FIXME: In the case of a scene, this is currently the scene name (though this leaves
|
|
||||||
/// us with a to-be-resolved problem of non-unique region names).
|
|
||||||
/// </summary>
|
|
||||||
/// <value>
|
|
||||||
/// The container.
|
|
||||||
/// </value>
|
|
||||||
public string Container { get; private set; }
|
|
||||||
|
|
||||||
public StatType StatType { get; private set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Action used to update this stat when the value is requested if it's a pull type.
|
|
||||||
/// </summary>
|
|
||||||
public Action<Stat> PullAction { get; private set; }
|
|
||||||
|
|
||||||
public StatVerbosity Verbosity { get; private set; }
|
|
||||||
public string ShortName { get; private set; }
|
|
||||||
public string Name { get; private set; }
|
|
||||||
public string Description { get; private set; }
|
|
||||||
public virtual string UnitName { get; private set; }
|
|
||||||
|
|
||||||
public virtual double Value
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
// Asking for an update here means that the updater cannot access this value without infinite recursion.
|
|
||||||
// XXX: A slightly messy but simple solution may be to flick a flag so we can tell if this is being
|
|
||||||
// called by the pull action and just return the value.
|
|
||||||
if (StatType == StatType.Pull)
|
|
||||||
PullAction(this);
|
|
||||||
|
|
||||||
return m_value;
|
|
||||||
}
|
|
||||||
|
|
||||||
set
|
|
||||||
{
|
|
||||||
m_value = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private double m_value;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Constructor
|
|
||||||
/// </summary>
|
|
||||||
/// <param name='shortName'>Short name for the stat. Must not contain spaces. e.g. "LongFrames"</param>
|
|
||||||
/// <param name='name'>Human readable name for the stat. e.g. "Long frames"</param>
|
|
||||||
/// <param name='description'>Description of stat</param>
|
|
||||||
/// <param name='unitName'>
|
|
||||||
/// Unit name for the stat. Should be preceeded by a space if the unit name isn't normally appeneded immediately to the value.
|
|
||||||
/// e.g. " frames"
|
|
||||||
/// </param>
|
|
||||||
/// <param name='category'>Category under which this stat should appear, e.g. "scene". Do not capitalize.</param>
|
|
||||||
/// <param name='container'>Entity to which this stat relates. e.g. scene name if this is a per scene stat.</param>
|
|
||||||
/// <param name='type'>Push or pull</param>
|
|
||||||
/// <param name='pullAction'>Pull stats need an action to update the stat on request. Push stats should set null here.</param>
|
|
||||||
/// <param name='verbosity'>Verbosity of stat. Controls whether it will appear in short stat display or only full display.</param>
|
|
||||||
public Stat(
|
|
||||||
string shortName,
|
|
||||||
string name,
|
|
||||||
string description,
|
|
||||||
string unitName,
|
|
||||||
string category,
|
|
||||||
string container,
|
|
||||||
StatType type,
|
|
||||||
Action<Stat> pullAction,
|
|
||||||
StatVerbosity verbosity)
|
|
||||||
{
|
|
||||||
if (StatsManager.SubCommands.Contains(category))
|
|
||||||
throw new Exception(
|
|
||||||
string.Format("Stat cannot be in category '{0}' since this is reserved for a subcommand", category));
|
|
||||||
|
|
||||||
ShortName = shortName;
|
|
||||||
Name = name;
|
|
||||||
Description = description;
|
|
||||||
UnitName = unitName;
|
|
||||||
Category = category;
|
|
||||||
Container = container;
|
|
||||||
StatType = type;
|
|
||||||
|
|
||||||
if (StatType == StatType.Push && pullAction != null)
|
|
||||||
throw new Exception("A push stat cannot have a pull action");
|
|
||||||
else
|
|
||||||
PullAction = pullAction;
|
|
||||||
|
|
||||||
Verbosity = verbosity;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual string ToConsoleString()
|
|
||||||
{
|
|
||||||
return string.Format(
|
|
||||||
"{0}.{1}.{2} : {3}{4}", Category, Container, ShortName, Value, UnitName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class PercentageStat : Stat
|
|
||||||
{
|
|
||||||
public long Antecedent { get; set; }
|
|
||||||
public long Consequent { get; set; }
|
|
||||||
|
|
||||||
public override double Value
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
// Asking for an update here means that the updater cannot access this value without infinite recursion.
|
|
||||||
// XXX: A slightly messy but simple solution may be to flick a flag so we can tell if this is being
|
|
||||||
// called by the pull action and just return the value.
|
|
||||||
if (StatType == StatType.Pull)
|
|
||||||
PullAction(this);
|
|
||||||
|
|
||||||
long c = Consequent;
|
|
||||||
|
|
||||||
// Avoid any chance of a multi-threaded divide-by-zero
|
|
||||||
if (c == 0)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
return (double)Antecedent / c * 100;
|
|
||||||
}
|
|
||||||
|
|
||||||
set
|
|
||||||
{
|
|
||||||
throw new InvalidOperationException("Cannot set value on a PercentageStat");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public PercentageStat(
|
|
||||||
string shortName,
|
|
||||||
string name,
|
|
||||||
string description,
|
|
||||||
string category,
|
|
||||||
string container,
|
|
||||||
StatType type,
|
|
||||||
Action<Stat> pullAction,
|
|
||||||
StatVerbosity verbosity)
|
|
||||||
: base(shortName, name, description, "%", category, container, type, pullAction, verbosity) {}
|
|
||||||
|
|
||||||
public override string ToConsoleString()
|
|
||||||
{
|
|
||||||
return string.Format(
|
|
||||||
"{0}.{1}.{2} : {3:0.##}{4} ({5}/{6})",
|
|
||||||
Category, Container, ShortName, Value, UnitName, Antecedent, Consequent);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -39,7 +39,7 @@ namespace OpenSim.Framework.Monitoring
|
||||||
public static class Watchdog
|
public static class Watchdog
|
||||||
{
|
{
|
||||||
/// <summary>Timer interval in milliseconds for the watchdog timer</summary>
|
/// <summary>Timer interval in milliseconds for the watchdog timer</summary>
|
||||||
const double WATCHDOG_INTERVAL_MS = 2500.0d;
|
public const double WATCHDOG_INTERVAL_MS = 2500.0d;
|
||||||
|
|
||||||
/// <summary>Default timeout in milliseconds before a thread is considered dead</summary>
|
/// <summary>Default timeout in milliseconds before a thread is considered dead</summary>
|
||||||
public const int DEFAULT_WATCHDOG_TIMEOUT_MS = 5000;
|
public const int DEFAULT_WATCHDOG_TIMEOUT_MS = 5000;
|
||||||
|
@ -380,6 +380,8 @@ namespace OpenSim.Framework.Monitoring
|
||||||
if (MemoryWatchdog.Enabled)
|
if (MemoryWatchdog.Enabled)
|
||||||
MemoryWatchdog.Update();
|
MemoryWatchdog.Update();
|
||||||
|
|
||||||
|
StatsManager.RecordStats();
|
||||||
|
|
||||||
m_watchdogTimer.Start();
|
m_watchdogTimer.Start();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -80,6 +80,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
"clientstack",
|
"clientstack",
|
||||||
scene.Name,
|
scene.Name,
|
||||||
StatType.Pull,
|
StatType.Pull,
|
||||||
|
MeasuresOfInterest.AverageChangeOverTime,
|
||||||
stat => stat.Value = m_udpServer.IncomingPacketsProcessed,
|
stat => stat.Value = m_udpServer.IncomingPacketsProcessed,
|
||||||
StatVerbosity.Debug));
|
StatVerbosity.Debug));
|
||||||
}
|
}
|
||||||
|
|
|
@ -411,18 +411,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
|
||||||
{
|
{
|
||||||
// m_log.DebugFormat("[INVENTORY ARCHIVER]: Found creator {0} via OSPA resolution", ospResolvedId);
|
// m_log.DebugFormat("[INVENTORY ARCHIVER]: Found creator {0} via OSPA resolution", ospResolvedId);
|
||||||
|
|
||||||
item.CreatorIdAsUuid = ospResolvedId;
|
// item.CreatorIdAsUuid = ospResolvedId;
|
||||||
|
|
||||||
// Don't preserve the OSPA in the creator id (which actually gets persisted to the
|
// Don't preserve the OSPA in the creator id (which actually gets persisted to the
|
||||||
// database). Instead, replace with the UUID that we found.
|
// database). Instead, replace with the UUID that we found.
|
||||||
item.CreatorId = ospResolvedId.ToString();
|
item.CreatorId = ospResolvedId.ToString();
|
||||||
|
|
||||||
item.CreatorData = string.Empty;
|
item.CreatorData = string.Empty;
|
||||||
}
|
}
|
||||||
else if (item.CreatorData == null || item.CreatorData == String.Empty)
|
else if (item.CreatorData == null || item.CreatorData == String.Empty)
|
||||||
{
|
{
|
||||||
item.CreatorId = m_userInfo.PrincipalID.ToString();
|
item.CreatorId = m_userInfo.PrincipalID.ToString();
|
||||||
item.CreatorIdAsUuid = new UUID(item.CreatorId);
|
// item.CreatorIdAsUuid = new UUID(item.CreatorId);
|
||||||
}
|
}
|
||||||
|
|
||||||
item.Owner = m_userInfo.PrincipalID;
|
item.Owner = m_userInfo.PrincipalID;
|
||||||
|
|
|
@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
|
||||||
item1.ID = UUID.Parse("00000000-0000-0000-0000-000000000020");
|
item1.ID = UUID.Parse("00000000-0000-0000-0000-000000000020");
|
||||||
item1.AssetID = asset1.FullID;
|
item1.AssetID = asset1.FullID;
|
||||||
item1.GroupID = UUID.Random();
|
item1.GroupID = UUID.Random();
|
||||||
item1.CreatorIdAsUuid = m_uaLL1.PrincipalID;
|
item1.CreatorId = m_uaLL1.PrincipalID.ToString();
|
||||||
item1.Owner = m_uaLL1.PrincipalID;
|
item1.Owner = m_uaLL1.PrincipalID;
|
||||||
item1.Folder = scene.InventoryService.GetRootFolder(m_uaLL1.PrincipalID).ID;
|
item1.Folder = scene.InventoryService.GetRootFolder(m_uaLL1.PrincipalID).ID;
|
||||||
scene.AddInventoryItem(item1);
|
scene.AddInventoryItem(item1);
|
||||||
|
@ -157,7 +157,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
|
||||||
coaItem.ID = UUID.Parse("00000000-0000-0000-0000-000000000180");
|
coaItem.ID = UUID.Parse("00000000-0000-0000-0000-000000000180");
|
||||||
coaItem.AssetID = coaAsset.FullID;
|
coaItem.AssetID = coaAsset.FullID;
|
||||||
coaItem.GroupID = UUID.Random();
|
coaItem.GroupID = UUID.Random();
|
||||||
coaItem.CreatorIdAsUuid = m_uaLL1.PrincipalID;
|
coaItem.CreatorId = m_uaLL1.PrincipalID.ToString();
|
||||||
coaItem.Owner = m_uaLL1.PrincipalID;
|
coaItem.Owner = m_uaLL1.PrincipalID;
|
||||||
coaItem.Folder = scene.InventoryService.GetRootFolder(m_uaLL1.PrincipalID).ID;
|
coaItem.Folder = scene.InventoryService.GetRootFolder(m_uaLL1.PrincipalID).ID;
|
||||||
scene.AddInventoryItem(coaItem);
|
scene.AddInventoryItem(coaItem);
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("Robust")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("d347c5cb-baf8-4566-a221-35d948e1776f")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Services.AssetService")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("fe57c0df-6101-4c23-ae1a-7b3e937843f9")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Services.AuthenticationService")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("Copyright © 2012")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("74497b6f-8844-4ed4-8f0d-2caf7f42b760")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Services.AuthorizationService")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("822586bb-cf25-4a2a-ac3e-59edaf147be3")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Services.AvatarService")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("0c9462ad-a5f3-46d1-ae9e-d6901fa33aa4")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Services.Base")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("db9f6f73-3a56-497f-a465-4bea9cb86062")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Services.Connectors")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("3ab0a9a1-3f45-4c07-a892-3848df8c0173")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -781,7 +781,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
|
||||||
invItem.CreationDate = item["CreationDate"].AsInteger();
|
invItem.CreationDate = item["CreationDate"].AsInteger();
|
||||||
invItem.CreatorId = item["CreatorID"].AsString();
|
invItem.CreatorId = item["CreatorID"].AsString();
|
||||||
invItem.CreatorData = item["CreatorData"].AsString();
|
invItem.CreatorData = item["CreatorData"].AsString();
|
||||||
invItem.CreatorIdAsUuid = item["CreatorID"].AsUUID();
|
|
||||||
invItem.Description = item["Description"].AsString();
|
invItem.Description = item["Description"].AsString();
|
||||||
invItem.Folder = item["ParentID"].AsUUID();
|
invItem.Folder = item["ParentID"].AsUUID();
|
||||||
invItem.ID = item["ID"].AsUUID();
|
invItem.ID = item["ID"].AsUUID();
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Services.FreeswitchService")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("af7d2401-cfd9-4ba5-8d6c-8af629984123")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Services.FriendsService")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("a265d071-e152-42cc-9674-3ddd053977f5")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Services.GridService")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("96526d7b-4943-4b8e-9f0f-5908af621090")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Services.HypergridService")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("8584f3c1-26dd-4d95-86f4-cd8f0110a18f")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Services.Interfaces")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("39091de1-1c4c-4ebe-bb01-31551ec1749d")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -1,700 +0,0 @@
|
||||||
/*
|
|
||||||
* 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 System.Reflection;
|
|
||||||
using log4net;
|
|
||||||
using Nini.Config;
|
|
||||||
using OpenMetaverse;
|
|
||||||
using OpenSim.Data;
|
|
||||||
using OpenSim.Framework;
|
|
||||||
using OpenSim.Services.Interfaces;
|
|
||||||
|
|
||||||
namespace OpenSim.Services.InventoryService
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// The Inventory service reference implementation
|
|
||||||
/// </summary>
|
|
||||||
public class InventoryService : InventoryServiceBase, IInventoryService
|
|
||||||
{
|
|
||||||
private static readonly ILog m_log
|
|
||||||
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
|
||||||
|
|
||||||
public InventoryService(IConfigSource config) : base(config)
|
|
||||||
{
|
|
||||||
m_log.Debug("[INVENTORY SERVICE]: Initialized.");
|
|
||||||
}
|
|
||||||
|
|
||||||
#region IInventoryServices methods
|
|
||||||
|
|
||||||
public string Host
|
|
||||||
{
|
|
||||||
get { return "default"; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
|
|
||||||
{
|
|
||||||
m_log.DebugFormat("[INVENTORY SERVICE]: Getting inventory skeleton for {0}", userId);
|
|
||||||
|
|
||||||
InventoryFolderBase rootFolder = GetRootFolder(userId);
|
|
||||||
|
|
||||||
// Agent has no inventory structure yet.
|
|
||||||
if (null == rootFolder)
|
|
||||||
{
|
|
||||||
m_log.DebugFormat("[INVENTORY SERVICE]: No root folder");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
List<InventoryFolderBase> userFolders = new List<InventoryFolderBase>();
|
|
||||||
|
|
||||||
userFolders.Add(rootFolder);
|
|
||||||
|
|
||||||
IList<InventoryFolderBase> folders = m_Database.getFolderHierarchy(rootFolder.ID);
|
|
||||||
userFolders.AddRange(folders);
|
|
||||||
|
|
||||||
// m_log.DebugFormat("[INVENTORY SERVICE]: Got folder {0} {1}", folder.name, folder.folderID);
|
|
||||||
|
|
||||||
return userFolders;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual bool HasInventoryForUser(UUID userID)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// See IInventoryServices
|
|
||||||
public virtual InventoryFolderBase GetRootFolder(UUID userID)
|
|
||||||
{
|
|
||||||
//m_log.DebugFormat("[INVENTORY SERVICE]: Getting root folder for {0}", userID);
|
|
||||||
|
|
||||||
// Retrieve the first root folder we get from the DB.
|
|
||||||
InventoryFolderBase rootFolder = m_Database.getUserRootFolder(userID);
|
|
||||||
if (rootFolder != null)
|
|
||||||
return rootFolder;
|
|
||||||
|
|
||||||
// Return nothing if the plugin was unable to supply a root folder
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// See IInventoryServices
|
|
||||||
public bool CreateUserInventory(UUID user)
|
|
||||||
{
|
|
||||||
InventoryFolderBase existingRootFolder;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
existingRootFolder = GetRootFolder(user);
|
|
||||||
}
|
|
||||||
catch /*(Exception e)*/
|
|
||||||
{
|
|
||||||
// Munch the exception, it has already been reported
|
|
||||||
//
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (null != existingRootFolder)
|
|
||||||
{
|
|
||||||
m_log.WarnFormat(
|
|
||||||
"[INVENTORY SERVICE]: Did not create a new inventory for user {0} since they already have "
|
|
||||||
+ "a root inventory folder with id {1}",
|
|
||||||
user, existingRootFolder.ID);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
UsersInventory inven = new UsersInventory();
|
|
||||||
inven.CreateNewInventorySet(user);
|
|
||||||
AddNewInventorySet(inven);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// See IInventoryServices
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Return a user's entire inventory synchronously
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="rawUserID"></param>
|
|
||||||
/// <returns>The user's inventory. If an inventory cannot be found then an empty collection is returned.</returns>
|
|
||||||
public InventoryCollection GetUserInventory(UUID userID)
|
|
||||||
{
|
|
||||||
m_log.InfoFormat("[INVENTORY SERVICE]: Processing request for inventory of {0}", userID);
|
|
||||||
|
|
||||||
// Uncomment me to simulate a slow responding inventory server
|
|
||||||
//Thread.Sleep(16000);
|
|
||||||
|
|
||||||
InventoryCollection invCollection = new InventoryCollection();
|
|
||||||
|
|
||||||
List<InventoryFolderBase> allFolders = GetInventorySkeleton(userID);
|
|
||||||
|
|
||||||
if (null == allFolders)
|
|
||||||
{
|
|
||||||
m_log.WarnFormat("[INVENTORY SERVICE]: No inventory found for user {0}", userID);
|
|
||||||
|
|
||||||
return invCollection;
|
|
||||||
}
|
|
||||||
|
|
||||||
List<InventoryItemBase> allItems = new List<InventoryItemBase>();
|
|
||||||
|
|
||||||
foreach (InventoryFolderBase folder in allFolders)
|
|
||||||
{
|
|
||||||
List<InventoryItemBase> items = GetFolderItems(userID, folder.ID);
|
|
||||||
|
|
||||||
if (items != null)
|
|
||||||
{
|
|
||||||
allItems.InsertRange(0, items);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
invCollection.UserID = userID;
|
|
||||||
invCollection.Folders = allFolders;
|
|
||||||
invCollection.Items = allItems;
|
|
||||||
|
|
||||||
// foreach (InventoryFolderBase folder in invCollection.Folders)
|
|
||||||
// {
|
|
||||||
// m_log.DebugFormat("[GRID INVENTORY SERVICE]: Sending back folder {0} {1}", folder.Name, folder.ID);
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// foreach (InventoryItemBase item in invCollection.Items)
|
|
||||||
// {
|
|
||||||
// m_log.DebugFormat("[GRID INVENTORY SERVICE]: Sending back item {0} {1}, folder {2}", item.Name, item.ID, item.Folder);
|
|
||||||
// }
|
|
||||||
|
|
||||||
m_log.InfoFormat(
|
|
||||||
"[INVENTORY SERVICE]: Sending back inventory response to user {0} containing {1} folders and {2} items",
|
|
||||||
invCollection.UserID, invCollection.Folders.Count, invCollection.Items.Count);
|
|
||||||
|
|
||||||
return invCollection;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Asynchronous inventory fetch.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="userID"></param>
|
|
||||||
/// <param name="callback"></param>
|
|
||||||
public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
|
|
||||||
{
|
|
||||||
m_log.InfoFormat("[INVENTORY SERVICE]: Requesting inventory for user {0}", userID);
|
|
||||||
|
|
||||||
List<InventoryFolderImpl> folders = new List<InventoryFolderImpl>();
|
|
||||||
List<InventoryItemBase> items = new List<InventoryItemBase>();
|
|
||||||
|
|
||||||
List<InventoryFolderBase> skeletonFolders = GetInventorySkeleton(userID);
|
|
||||||
|
|
||||||
if (skeletonFolders != null)
|
|
||||||
{
|
|
||||||
InventoryFolderImpl rootFolder = null;
|
|
||||||
|
|
||||||
// Need to retrieve the root folder on the first pass
|
|
||||||
foreach (InventoryFolderBase folder in skeletonFolders)
|
|
||||||
{
|
|
||||||
if (folder.ParentID == UUID.Zero)
|
|
||||||
{
|
|
||||||
rootFolder = new InventoryFolderImpl(folder);
|
|
||||||
folders.Add(rootFolder);
|
|
||||||
items.AddRange(GetFolderItems(userID, rootFolder.ID));
|
|
||||||
break; // Only 1 root folder per user
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (rootFolder != null)
|
|
||||||
{
|
|
||||||
foreach (InventoryFolderBase folder in skeletonFolders)
|
|
||||||
{
|
|
||||||
if (folder.ID != rootFolder.ID)
|
|
||||||
{
|
|
||||||
folders.Add(new InventoryFolderImpl(folder));
|
|
||||||
items.AddRange(GetFolderItems(userID, folder.ID));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
m_log.InfoFormat(
|
|
||||||
"[INVENTORY SERVICE]: Received inventory response for user {0} containing {1} folders and {2} items",
|
|
||||||
userID, folders.Count, items.Count);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.WarnFormat("[INVENTORY SERVICE]: User {0} inventory not available", userID);
|
|
||||||
}
|
|
||||||
|
|
||||||
Util.FireAndForget(delegate { callback(folders, items); });
|
|
||||||
}
|
|
||||||
|
|
||||||
public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
|
|
||||||
{
|
|
||||||
// Uncomment me to simulate a slow responding inventory server
|
|
||||||
//Thread.Sleep(16000);
|
|
||||||
|
|
||||||
InventoryCollection invCollection = new InventoryCollection();
|
|
||||||
|
|
||||||
List<InventoryItemBase> items = GetFolderItems(userID, folderID);
|
|
||||||
List<InventoryFolderBase> folders = RequestSubFolders(folderID);
|
|
||||||
|
|
||||||
invCollection.UserID = userID;
|
|
||||||
invCollection.Folders = folders;
|
|
||||||
invCollection.Items = items;
|
|
||||||
|
|
||||||
m_log.DebugFormat("[INVENTORY SERVICE]: Found {0} items and {1} folders in folder {2}", items.Count, folders.Count, folderID);
|
|
||||||
|
|
||||||
return invCollection;
|
|
||||||
}
|
|
||||||
|
|
||||||
public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
|
|
||||||
{
|
|
||||||
// m_log.DebugFormat("[INVENTORY SERVICE]: Looking for folder type {0} for user {1}", type, userID);
|
|
||||||
|
|
||||||
InventoryFolderBase root = m_Database.getUserRootFolder(userID);
|
|
||||||
if (root != null)
|
|
||||||
{
|
|
||||||
List<InventoryFolderBase> folders = RequestSubFolders(root.ID);
|
|
||||||
|
|
||||||
foreach (InventoryFolderBase folder in folders)
|
|
||||||
{
|
|
||||||
if (folder.Type == (short)type)
|
|
||||||
{
|
|
||||||
// m_log.DebugFormat(
|
|
||||||
// "[INVENTORY SERVICE]: Found folder {0} type {1}", folder.Name, (AssetType)folder.Type);
|
|
||||||
|
|
||||||
return folder;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// we didn't find any folder of that type. Return the root folder
|
|
||||||
// hopefully the root folder is not null. If it is, too bad
|
|
||||||
return root;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID)
|
|
||||||
{
|
|
||||||
InventoryFolderBase root = GetRootFolder(userID);
|
|
||||||
if (root != null)
|
|
||||||
{
|
|
||||||
InventoryCollection content = GetFolderContent(userID, root.ID);
|
|
||||||
if (content != null)
|
|
||||||
{
|
|
||||||
Dictionary<AssetType, InventoryFolderBase> folders = new Dictionary<AssetType, InventoryFolderBase>();
|
|
||||||
foreach (InventoryFolderBase folder in content.Folders)
|
|
||||||
{
|
|
||||||
if ((folder.Type != (short)AssetType.Folder) && (folder.Type != (short)AssetType.Unknown))
|
|
||||||
folders[(AssetType)folder.Type] = folder;
|
|
||||||
}
|
|
||||||
m_log.DebugFormat("[INVENTORY SERVICE]: Got {0} system folders for {1}", folders.Count, userID);
|
|
||||||
return folders;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
m_log.WarnFormat("[INVENTORY SERVICE]: System folders for {0} not found", userID);
|
|
||||||
return new Dictionary<AssetType, InventoryFolderBase>();
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<InventoryItemBase> GetActiveGestures(UUID userId)
|
|
||||||
{
|
|
||||||
List<InventoryItemBase> activeGestures = new List<InventoryItemBase>();
|
|
||||||
activeGestures.AddRange(m_Database.fetchActiveGestures(userId));
|
|
||||||
|
|
||||||
return activeGestures;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region Methods used by GridInventoryService
|
|
||||||
|
|
||||||
public List<InventoryFolderBase> RequestSubFolders(UUID parentFolderID)
|
|
||||||
{
|
|
||||||
List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>();
|
|
||||||
|
|
||||||
inventoryList.AddRange(m_Database.getInventoryFolders(parentFolderID));
|
|
||||||
|
|
||||||
return inventoryList;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
|
|
||||||
{
|
|
||||||
List<InventoryItemBase> itemsList = new List<InventoryItemBase>();
|
|
||||||
|
|
||||||
itemsList.AddRange(m_Database.getInventoryInFolder(folderID));
|
|
||||||
|
|
||||||
// m_log.DebugFormat(
|
|
||||||
// "[INVENTORY SERVICE]: Found {0} items in folder {1} for {2}", itemsList.Count, folderID, userID);
|
|
||||||
|
|
||||||
return itemsList;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
// See IInventoryServices
|
|
||||||
public virtual bool AddFolder(InventoryFolderBase folder)
|
|
||||||
{
|
|
||||||
m_log.DebugFormat(
|
|
||||||
"[INVENTORY SERVICE]: Adding folder {0} {1} to folder {2}", folder.Name, folder.ID, folder.ParentID);
|
|
||||||
|
|
||||||
m_Database.addInventoryFolder(folder);
|
|
||||||
|
|
||||||
// FIXME: Should return false on failure
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// See IInventoryServices
|
|
||||||
public virtual bool UpdateFolder(InventoryFolderBase folder)
|
|
||||||
{
|
|
||||||
m_log.DebugFormat(
|
|
||||||
"[INVENTORY SERVICE]: Updating folder {0} {1} to folder {2}", folder.Name, folder.ID, folder.ParentID);
|
|
||||||
|
|
||||||
m_Database.updateInventoryFolder(folder);
|
|
||||||
|
|
||||||
// FIXME: Should return false on failure
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// See IInventoryServices
|
|
||||||
public virtual bool MoveFolder(InventoryFolderBase folder)
|
|
||||||
{
|
|
||||||
m_log.DebugFormat(
|
|
||||||
"[INVENTORY SERVICE]: Moving folder {0} {1} to folder {2}", folder.Name, folder.ID, folder.ParentID);
|
|
||||||
|
|
||||||
m_Database.moveInventoryFolder(folder);
|
|
||||||
|
|
||||||
// FIXME: Should return false on failure
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// See IInventoryServices
|
|
||||||
public virtual bool AddItem(InventoryItemBase item)
|
|
||||||
{
|
|
||||||
// m_log.DebugFormat(
|
|
||||||
// "[INVENTORY SERVICE]: Adding item {0} {1} to folder {2} for {3}",
|
|
||||||
// item.Name, item.ID, item.Folder, item.Owner);
|
|
||||||
|
|
||||||
m_Database.addInventoryItem(item);
|
|
||||||
|
|
||||||
// FIXME: Should return false on failure
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// See IInventoryServices
|
|
||||||
public virtual bool UpdateItem(InventoryItemBase item)
|
|
||||||
{
|
|
||||||
m_log.InfoFormat(
|
|
||||||
"[INVENTORY SERVICE]: Updating item {0} {1} in folder {2}", item.Name, item.ID, item.Folder);
|
|
||||||
|
|
||||||
m_Database.updateInventoryItem(item);
|
|
||||||
|
|
||||||
// FIXME: Should return false on failure
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual bool MoveItems(UUID ownerID, List<InventoryItemBase> items)
|
|
||||||
{
|
|
||||||
m_log.InfoFormat(
|
|
||||||
"[INVENTORY SERVICE]: Moving {0} items from user {1}", items.Count, ownerID);
|
|
||||||
|
|
||||||
InventoryItemBase itm = null;
|
|
||||||
foreach (InventoryItemBase item in items)
|
|
||||||
{
|
|
||||||
itm = GetInventoryItem(item.ID);
|
|
||||||
itm.Folder = item.Folder;
|
|
||||||
if ((item.Name != null) && !item.Name.Equals(string.Empty))
|
|
||||||
itm.Name = item.Name;
|
|
||||||
m_Database.updateInventoryItem(itm);
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// See IInventoryServices
|
|
||||||
public virtual bool DeleteItems(UUID owner, List<UUID> itemIDs)
|
|
||||||
{
|
|
||||||
m_log.InfoFormat(
|
|
||||||
"[INVENTORY SERVICE]: Deleting {0} items from user {1}", itemIDs.Count, owner);
|
|
||||||
|
|
||||||
// uhh.....
|
|
||||||
foreach (UUID uuid in itemIDs)
|
|
||||||
m_Database.deleteInventoryItem(uuid);
|
|
||||||
|
|
||||||
// FIXME: Should return false on failure
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual InventoryItemBase GetItem(InventoryItemBase item)
|
|
||||||
{
|
|
||||||
InventoryItemBase result = m_Database.getInventoryItem(item.ID);
|
|
||||||
if (result != null)
|
|
||||||
return result;
|
|
||||||
m_log.DebugFormat("[INVENTORY SERVICE]: GetItem failed to find item {0}", item.ID);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
|
||||||
{
|
|
||||||
InventoryFolderBase result = m_Database.getInventoryFolder(folder.ID);
|
|
||||||
if (result != null)
|
|
||||||
return result;
|
|
||||||
|
|
||||||
m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folder.ID);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
|
|
||||||
{
|
|
||||||
m_log.InfoFormat("[INVENTORY SERVICE]: Deleting {0} folders from user {1}", folderIDs.Count, ownerID);
|
|
||||||
foreach (UUID id in folderIDs)
|
|
||||||
{
|
|
||||||
InventoryFolderBase folder = new InventoryFolderBase(id, ownerID);
|
|
||||||
PurgeFolder(folder);
|
|
||||||
m_Database.deleteInventoryFolder(id);
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Purge a folder of all items items and subfolders.
|
|
||||||
///
|
|
||||||
/// FIXME: Really nasty in a sense, because we have to query the database to get information we may
|
|
||||||
/// already know... Needs heavy refactoring.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="folder"></param>
|
|
||||||
public virtual bool PurgeFolder(InventoryFolderBase folder)
|
|
||||||
{
|
|
||||||
m_log.DebugFormat(
|
|
||||||
"[INVENTORY SERVICE]: Purging folder {0} {1} of its contents", folder.Name, folder.ID);
|
|
||||||
|
|
||||||
List<InventoryFolderBase> subFolders = RequestSubFolders(folder.ID);
|
|
||||||
|
|
||||||
foreach (InventoryFolderBase subFolder in subFolders)
|
|
||||||
{
|
|
||||||
// m_log.DebugFormat("[INVENTORY SERVICE]: Deleting folder {0} {1}", subFolder.Name, subFolder.ID);
|
|
||||||
|
|
||||||
m_Database.deleteInventoryFolder(subFolder.ID);
|
|
||||||
}
|
|
||||||
|
|
||||||
List<InventoryItemBase> items = GetFolderItems(folder.Owner, folder.ID);
|
|
||||||
|
|
||||||
List<UUID> uuids = new List<UUID>();
|
|
||||||
foreach (InventoryItemBase item in items)
|
|
||||||
{
|
|
||||||
uuids.Add(item.ID);
|
|
||||||
}
|
|
||||||
DeleteItems(folder.Owner, uuids);
|
|
||||||
|
|
||||||
// FIXME: Should return false on failure
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void AddNewInventorySet(UsersInventory inventory)
|
|
||||||
{
|
|
||||||
foreach (InventoryFolderBase folder in inventory.Folders.Values)
|
|
||||||
{
|
|
||||||
AddFolder(folder);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public InventoryItemBase GetInventoryItem(UUID itemID)
|
|
||||||
{
|
|
||||||
InventoryItemBase item = m_Database.getInventoryItem(itemID);
|
|
||||||
if (item != null)
|
|
||||||
return item;
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int GetAssetPermissions(UUID userID, UUID assetID)
|
|
||||||
{
|
|
||||||
InventoryFolderBase parent = GetRootFolder(userID);
|
|
||||||
return FindAssetPerms(parent, assetID);
|
|
||||||
}
|
|
||||||
|
|
||||||
private int FindAssetPerms(InventoryFolderBase folder, UUID assetID)
|
|
||||||
{
|
|
||||||
InventoryCollection contents = GetFolderContent(folder.Owner, folder.ID);
|
|
||||||
|
|
||||||
int perms = 0;
|
|
||||||
foreach (InventoryItemBase item in contents.Items)
|
|
||||||
{
|
|
||||||
if (item.AssetID == assetID)
|
|
||||||
perms = (int)item.CurrentPermissions | perms;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (InventoryFolderBase subfolder in contents.Folders)
|
|
||||||
perms = perms | FindAssetPerms(subfolder, assetID);
|
|
||||||
|
|
||||||
return perms;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Used to create a new user inventory.
|
|
||||||
/// </summary>
|
|
||||||
private class UsersInventory
|
|
||||||
{
|
|
||||||
public Dictionary<UUID, InventoryFolderBase> Folders = new Dictionary<UUID, InventoryFolderBase>();
|
|
||||||
public Dictionary<UUID, InventoryItemBase> Items = new Dictionary<UUID, InventoryItemBase>();
|
|
||||||
|
|
||||||
public virtual void CreateNewInventorySet(UUID user)
|
|
||||||
{
|
|
||||||
InventoryFolderBase folder = new InventoryFolderBase();
|
|
||||||
|
|
||||||
folder.ParentID = UUID.Zero;
|
|
||||||
folder.Owner = user;
|
|
||||||
folder.ID = UUID.Random();
|
|
||||||
folder.Name = "My Inventory";
|
|
||||||
folder.Type = (short)AssetType.Folder;
|
|
||||||
folder.Version = 1;
|
|
||||||
Folders.Add(folder.ID, folder);
|
|
||||||
|
|
||||||
UUID rootFolder = folder.ID;
|
|
||||||
|
|
||||||
folder = new InventoryFolderBase();
|
|
||||||
folder.ParentID = rootFolder;
|
|
||||||
folder.Owner = user;
|
|
||||||
folder.ID = UUID.Random();
|
|
||||||
folder.Name = "Animations";
|
|
||||||
folder.Type = (short)AssetType.Animation;
|
|
||||||
folder.Version = 1;
|
|
||||||
Folders.Add(folder.ID, folder);
|
|
||||||
|
|
||||||
folder = new InventoryFolderBase();
|
|
||||||
folder.ParentID = rootFolder;
|
|
||||||
folder.Owner = user;
|
|
||||||
folder.ID = UUID.Random();
|
|
||||||
folder.Name = "Body Parts";
|
|
||||||
folder.Type = (short)AssetType.Bodypart;
|
|
||||||
folder.Version = 1;
|
|
||||||
Folders.Add(folder.ID, folder);
|
|
||||||
|
|
||||||
folder = new InventoryFolderBase();
|
|
||||||
folder.ParentID = rootFolder;
|
|
||||||
folder.Owner = user;
|
|
||||||
folder.ID = UUID.Random();
|
|
||||||
folder.Name = "Calling Cards";
|
|
||||||
folder.Type = (short)AssetType.CallingCard;
|
|
||||||
folder.Version = 1;
|
|
||||||
Folders.Add(folder.ID, folder);
|
|
||||||
|
|
||||||
folder = new InventoryFolderBase();
|
|
||||||
folder.ParentID = rootFolder;
|
|
||||||
folder.Owner = user;
|
|
||||||
folder.ID = UUID.Random();
|
|
||||||
folder.Name = "Clothing";
|
|
||||||
folder.Type = (short)AssetType.Clothing;
|
|
||||||
folder.Version = 1;
|
|
||||||
Folders.Add(folder.ID, folder);
|
|
||||||
|
|
||||||
folder = new InventoryFolderBase();
|
|
||||||
folder.ParentID = rootFolder;
|
|
||||||
folder.Owner = user;
|
|
||||||
folder.ID = UUID.Random();
|
|
||||||
folder.Name = "Gestures";
|
|
||||||
folder.Type = (short)AssetType.Gesture;
|
|
||||||
folder.Version = 1;
|
|
||||||
Folders.Add(folder.ID, folder);
|
|
||||||
|
|
||||||
folder = new InventoryFolderBase();
|
|
||||||
folder.ParentID = rootFolder;
|
|
||||||
folder.Owner = user;
|
|
||||||
folder.ID = UUID.Random();
|
|
||||||
folder.Name = "Landmarks";
|
|
||||||
folder.Type = (short)AssetType.Landmark;
|
|
||||||
folder.Version = 1;
|
|
||||||
Folders.Add(folder.ID, folder);
|
|
||||||
|
|
||||||
folder = new InventoryFolderBase();
|
|
||||||
folder.ParentID = rootFolder;
|
|
||||||
folder.Owner = user;
|
|
||||||
folder.ID = UUID.Random();
|
|
||||||
folder.Name = "Lost And Found";
|
|
||||||
folder.Type = (short)AssetType.LostAndFoundFolder;
|
|
||||||
folder.Version = 1;
|
|
||||||
Folders.Add(folder.ID, folder);
|
|
||||||
|
|
||||||
folder = new InventoryFolderBase();
|
|
||||||
folder.ParentID = rootFolder;
|
|
||||||
folder.Owner = user;
|
|
||||||
folder.ID = UUID.Random();
|
|
||||||
folder.Name = "Notecards";
|
|
||||||
folder.Type = (short)AssetType.Notecard;
|
|
||||||
folder.Version = 1;
|
|
||||||
Folders.Add(folder.ID, folder);
|
|
||||||
|
|
||||||
folder = new InventoryFolderBase();
|
|
||||||
folder.ParentID = rootFolder;
|
|
||||||
folder.Owner = user;
|
|
||||||
folder.ID = UUID.Random();
|
|
||||||
folder.Name = "Objects";
|
|
||||||
folder.Type = (short)AssetType.Object;
|
|
||||||
folder.Version = 1;
|
|
||||||
Folders.Add(folder.ID, folder);
|
|
||||||
|
|
||||||
folder = new InventoryFolderBase();
|
|
||||||
folder.ParentID = rootFolder;
|
|
||||||
folder.Owner = user;
|
|
||||||
folder.ID = UUID.Random();
|
|
||||||
folder.Name = "Photo Album";
|
|
||||||
folder.Type = (short)AssetType.SnapshotFolder;
|
|
||||||
folder.Version = 1;
|
|
||||||
Folders.Add(folder.ID, folder);
|
|
||||||
|
|
||||||
folder = new InventoryFolderBase();
|
|
||||||
folder.ParentID = rootFolder;
|
|
||||||
folder.Owner = user;
|
|
||||||
folder.ID = UUID.Random();
|
|
||||||
folder.Name = "Scripts";
|
|
||||||
folder.Type = (short)AssetType.LSLText;
|
|
||||||
folder.Version = 1;
|
|
||||||
Folders.Add(folder.ID, folder);
|
|
||||||
|
|
||||||
folder = new InventoryFolderBase();
|
|
||||||
folder.ParentID = rootFolder;
|
|
||||||
folder.Owner = user;
|
|
||||||
folder.ID = UUID.Random();
|
|
||||||
folder.Name = "Sounds";
|
|
||||||
folder.Type = (short)AssetType.Sound;
|
|
||||||
folder.Version = 1;
|
|
||||||
Folders.Add(folder.ID, folder);
|
|
||||||
|
|
||||||
folder = new InventoryFolderBase();
|
|
||||||
folder.ParentID = rootFolder;
|
|
||||||
folder.Owner = user;
|
|
||||||
folder.ID = UUID.Random();
|
|
||||||
folder.Name = "Textures";
|
|
||||||
folder.Type = (short)AssetType.Texture;
|
|
||||||
folder.Version = 1;
|
|
||||||
Folders.Add(folder.ID, folder);
|
|
||||||
|
|
||||||
folder = new InventoryFolderBase();
|
|
||||||
folder.ParentID = rootFolder;
|
|
||||||
folder.Owner = user;
|
|
||||||
folder.ID = UUID.Random();
|
|
||||||
folder.Name = "Trash";
|
|
||||||
folder.Type = (short)AssetType.TrashFolder;
|
|
||||||
folder.Version = 1;
|
|
||||||
Folders.Add(folder.ID, folder);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Services.InventoryService")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("d96d6d8c-9769-47e7-88dc-dbeb8fe7105a")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -0,0 +1,177 @@
|
||||||
|
/*
|
||||||
|
* 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 Nini.Config;
|
||||||
|
using NUnit.Framework;
|
||||||
|
using OpenMetaverse;
|
||||||
|
using OpenSim.Framework;
|
||||||
|
using OpenSim.Server.Base;
|
||||||
|
using OpenSim.Services.Interfaces;
|
||||||
|
using OpenSim.Tests.Common;
|
||||||
|
|
||||||
|
namespace OpenSim.Services.InventoryService.Tests
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Tests for the XInventoryService
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// TODO: Fill out more tests.
|
||||||
|
/// </remarks>
|
||||||
|
[TestFixture]
|
||||||
|
public class XInventoryServiceTests : OpenSimTestCase
|
||||||
|
{
|
||||||
|
private IInventoryService CreateXInventoryService()
|
||||||
|
{
|
||||||
|
IConfigSource config = new IniConfigSource();
|
||||||
|
config.AddConfig("InventoryService");
|
||||||
|
config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
|
||||||
|
|
||||||
|
return ServerUtils.LoadPlugin<IInventoryService>(
|
||||||
|
"OpenSim.Services.InventoryService.dll:XInventoryService", new Object[] { config });
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Tests add item operation.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// TODO: Test all operations.
|
||||||
|
/// </remarks>
|
||||||
|
[Test]
|
||||||
|
public void TestAddItem()
|
||||||
|
{
|
||||||
|
TestHelpers.InMethod();
|
||||||
|
|
||||||
|
string creatorId = TestHelpers.ParseTail(0x1).ToString();
|
||||||
|
UUID ownerId = TestHelpers.ParseTail(0x2);
|
||||||
|
UUID itemId = TestHelpers.ParseTail(0x10);
|
||||||
|
UUID assetId = TestHelpers.ParseTail(0x20);
|
||||||
|
UUID folderId = TestHelpers.ParseTail(0x30);
|
||||||
|
int invType = (int)InventoryType.Animation;
|
||||||
|
int assetType = (int)AssetType.Animation;
|
||||||
|
string itemName = "item1";
|
||||||
|
|
||||||
|
IInventoryService xis = CreateXInventoryService();
|
||||||
|
|
||||||
|
InventoryItemBase itemToStore
|
||||||
|
= new InventoryItemBase(itemId, ownerId)
|
||||||
|
{
|
||||||
|
CreatorIdentification = creatorId.ToString(),
|
||||||
|
AssetID = assetId,
|
||||||
|
Name = itemName,
|
||||||
|
Folder = folderId,
|
||||||
|
InvType = invType,
|
||||||
|
AssetType = assetType
|
||||||
|
};
|
||||||
|
|
||||||
|
Assert.That(xis.AddItem(itemToStore), Is.True);
|
||||||
|
|
||||||
|
InventoryItemBase itemRetrieved = new InventoryItemBase(itemId);
|
||||||
|
itemRetrieved = xis.GetItem(itemRetrieved);
|
||||||
|
|
||||||
|
Assert.That(itemRetrieved, Is.Not.Null);
|
||||||
|
Assert.That(itemRetrieved.CreatorId, Is.EqualTo(creatorId));
|
||||||
|
Assert.That(itemRetrieved.Owner, Is.EqualTo(ownerId));
|
||||||
|
Assert.That(itemRetrieved.AssetID, Is.EqualTo(assetId));
|
||||||
|
Assert.That(itemRetrieved.Folder, Is.EqualTo(folderId));
|
||||||
|
Assert.That(itemRetrieved.InvType, Is.EqualTo(invType));
|
||||||
|
Assert.That(itemRetrieved.AssetType, Is.EqualTo(assetType));
|
||||||
|
Assert.That(itemRetrieved.Name, Is.EqualTo(itemName));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestUpdateItem()
|
||||||
|
{
|
||||||
|
TestHelpers.InMethod();
|
||||||
|
// TestHelpers.EnableLogging();
|
||||||
|
|
||||||
|
string creatorId = TestHelpers.ParseTail(0x1).ToString();
|
||||||
|
UUID ownerId = TestHelpers.ParseTail(0x2);
|
||||||
|
UUID itemId = TestHelpers.ParseTail(0x10);
|
||||||
|
UUID assetId = TestHelpers.ParseTail(0x20);
|
||||||
|
UUID folderId = TestHelpers.ParseTail(0x30);
|
||||||
|
int invType = (int)InventoryType.Animation;
|
||||||
|
int assetType = (int)AssetType.Animation;
|
||||||
|
string itemName = "item1";
|
||||||
|
string itemName2 = "item2";
|
||||||
|
|
||||||
|
IInventoryService xis = CreateXInventoryService();
|
||||||
|
|
||||||
|
InventoryItemBase itemToStore
|
||||||
|
= new InventoryItemBase(itemId, ownerId)
|
||||||
|
{
|
||||||
|
CreatorIdentification = creatorId.ToString(),
|
||||||
|
AssetID = assetId,
|
||||||
|
Name = itemName,
|
||||||
|
Folder = folderId,
|
||||||
|
InvType = invType,
|
||||||
|
AssetType = assetType
|
||||||
|
};
|
||||||
|
|
||||||
|
Assert.That(xis.AddItem(itemToStore), Is.True);
|
||||||
|
|
||||||
|
// Normal update
|
||||||
|
itemToStore.Name = itemName2;
|
||||||
|
|
||||||
|
Assert.That(xis.UpdateItem(itemToStore), Is.True);
|
||||||
|
|
||||||
|
InventoryItemBase itemRetrieved = new InventoryItemBase(itemId);
|
||||||
|
itemRetrieved = xis.GetItem(itemRetrieved);
|
||||||
|
|
||||||
|
Assert.That(itemRetrieved, Is.Not.Null);
|
||||||
|
Assert.That(itemRetrieved.Name, Is.EqualTo(itemName2));
|
||||||
|
|
||||||
|
// Attempt to update properties that should never change
|
||||||
|
string creatorId2 = TestHelpers.ParseTail(0x7).ToString();
|
||||||
|
UUID ownerId2 = TestHelpers.ParseTail(0x8);
|
||||||
|
UUID folderId2 = TestHelpers.ParseTail(0x70);
|
||||||
|
int invType2 = (int)InventoryType.CallingCard;
|
||||||
|
int assetType2 = (int)AssetType.CallingCard;
|
||||||
|
string itemName3 = "item3";
|
||||||
|
|
||||||
|
itemToStore.CreatorIdentification = creatorId2.ToString();
|
||||||
|
itemToStore.Owner = ownerId2;
|
||||||
|
itemToStore.Folder = folderId2;
|
||||||
|
itemToStore.InvType = invType2;
|
||||||
|
itemToStore.AssetType = assetType2;
|
||||||
|
itemToStore.Name = itemName3;
|
||||||
|
|
||||||
|
Assert.That(xis.UpdateItem(itemToStore), Is.True);
|
||||||
|
|
||||||
|
itemRetrieved = xis.GetItem(itemRetrieved);
|
||||||
|
|
||||||
|
Assert.That(itemRetrieved, Is.Not.Null);
|
||||||
|
Assert.That(itemRetrieved.CreatorId, Is.EqualTo(creatorId));
|
||||||
|
Assert.That(itemRetrieved.Owner, Is.EqualTo(ownerId));
|
||||||
|
Assert.That(itemRetrieved.AssetID, Is.EqualTo(assetId));
|
||||||
|
Assert.That(itemRetrieved.Folder, Is.EqualTo(folderId));
|
||||||
|
Assert.That(itemRetrieved.InvType, Is.EqualTo(invType));
|
||||||
|
Assert.That(itemRetrieved.AssetType, Is.EqualTo(assetType));
|
||||||
|
Assert.That(itemRetrieved.Name, Is.EqualTo(itemName3));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -476,6 +476,46 @@ namespace OpenSim.Services.InventoryService
|
||||||
// m_log.InfoFormat(
|
// m_log.InfoFormat(
|
||||||
// "[XINVENTORY SERVICE]: Updating item {0} {1} in folder {2}", item.Name, item.ID, item.Folder);
|
// "[XINVENTORY SERVICE]: Updating item {0} {1} in folder {2}", item.Name, item.ID, item.Folder);
|
||||||
|
|
||||||
|
InventoryItemBase retrievedItem = GetItem(item);
|
||||||
|
|
||||||
|
if (retrievedItem == null)
|
||||||
|
{
|
||||||
|
m_log.WarnFormat(
|
||||||
|
"[XINVENTORY SERVICE]: Tried to update item {0} {1}, owner {2} but no existing item found.",
|
||||||
|
item.Name, item.ID, item.Owner);
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Do not allow invariants to change. Changes to folder ID occur in MoveItems()
|
||||||
|
if (retrievedItem.InvType != item.InvType
|
||||||
|
|| retrievedItem.AssetType != item.AssetType
|
||||||
|
|| retrievedItem.Folder != item.Folder
|
||||||
|
|| retrievedItem.CreatorIdentification != item.CreatorIdentification
|
||||||
|
|| retrievedItem.Owner != item.Owner)
|
||||||
|
{
|
||||||
|
m_log.WarnFormat(
|
||||||
|
"[XINVENTORY SERVICE]: Caller to UpdateItem() for {0} {1} tried to alter property(s) that should be invariant, (InvType, AssetType, Folder, CreatorIdentification, Owner), existing ({2}, {3}, {4}, {5}, {6}), update ({7}, {8}, {9}, {10}, {11})",
|
||||||
|
retrievedItem.Name,
|
||||||
|
retrievedItem.ID,
|
||||||
|
retrievedItem.InvType,
|
||||||
|
retrievedItem.AssetType,
|
||||||
|
retrievedItem.Folder,
|
||||||
|
retrievedItem.CreatorIdentification,
|
||||||
|
retrievedItem.Owner,
|
||||||
|
item.InvType,
|
||||||
|
item.AssetType,
|
||||||
|
item.Folder,
|
||||||
|
item.CreatorIdentification,
|
||||||
|
item.Owner);
|
||||||
|
|
||||||
|
item.InvType = retrievedItem.InvType;
|
||||||
|
item.AssetType = retrievedItem.AssetType;
|
||||||
|
item.Folder = retrievedItem.Folder;
|
||||||
|
item.CreatorIdentification = retrievedItem.CreatorIdentification;
|
||||||
|
item.Owner = retrievedItem.Owner;
|
||||||
|
}
|
||||||
|
|
||||||
return m_Database.StoreItem(ConvertFromOpenSim(item));
|
return m_Database.StoreItem(ConvertFromOpenSim(item));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Services.LLLoginService")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("cbeb8f23-3896-4076-97fd-f955b0af6a93")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Services.MapImageService")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("5e679df7-1d2a-401a-8966-b93677bb5839")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Services.PresenceService")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("a875a0bd-eab0-40a2-b5c4-3afddc3b4d2d")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Services.UserAccountService")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("fdb4771d-9928-4db4-aeb5-90cac2976584")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Tools.lslc")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("002864e7-b2a2-41d2-add8-82f653663160")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("OpenSim.Tools.Configger")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("67d7fdf2-554c-40f0-8f9d-f71373c20926")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -0,0 +1,33 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("pCampBot")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("http://opensimulator.org")]
|
||||||
|
[assembly: AssemblyProduct("OpenSim")]
|
||||||
|
[assembly: AssemblyCopyright("OpenSimulator developers")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("84a69c60-76d3-4846-bd5b-0e1083774039")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
[assembly: AssemblyVersion("0.7.5.*")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
46
prebuild.xml
46
prebuild.xml
|
@ -1245,7 +1245,9 @@
|
||||||
<Reference name="log4net" path="../../../bin/"/>
|
<Reference name="log4net" path="../../../bin/"/>
|
||||||
|
|
||||||
<Files>
|
<Files>
|
||||||
<Match pattern="*.cs" recurse="true"/>
|
<Match pattern="*.cs" recurse="true">
|
||||||
|
<Exclude name="Tests" pattern="Tests"/>
|
||||||
|
</Match>
|
||||||
</Files>
|
</Files>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
@ -2843,6 +2845,48 @@
|
||||||
</Files>
|
</Files>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
<Project frameworkVersion="v3_5" name="OpenSim.Services.InventoryService.Tests" path="OpenSim/Services/InventoryService/Tests" type="Library">
|
||||||
|
<Configuration name="Debug">
|
||||||
|
<Options>
|
||||||
|
<OutputPath>../../../../bin/</OutputPath>
|
||||||
|
</Options>
|
||||||
|
</Configuration>
|
||||||
|
<Configuration name="Release">
|
||||||
|
<Options>
|
||||||
|
<OutputPath>../../../../bin/</OutputPath>
|
||||||
|
</Options>
|
||||||
|
</Configuration>
|
||||||
|
|
||||||
|
<ReferencePath>../../../../bin/</ReferencePath>
|
||||||
|
<Reference name="System"/>
|
||||||
|
<Reference name="System.Core"/>
|
||||||
|
<Reference name="System.Drawing"/>
|
||||||
|
<Reference name="System.Xml"/>
|
||||||
|
<Reference name="System.Web"/>
|
||||||
|
<Reference name="nunit.framework" path="../../../../bin/"/>
|
||||||
|
<Reference name="OpenMetaverse" path="../../../../bin/"/>
|
||||||
|
<Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
|
||||||
|
<Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/>
|
||||||
|
<Reference name="OpenSim.Capabilities"/>
|
||||||
|
<Reference name="OpenSim.Capabilities.Handlers"/>
|
||||||
|
<Reference name="OpenSim.Framework"/>
|
||||||
|
<Reference name="OpenSim.Framework.Console"/>
|
||||||
|
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
|
||||||
|
<Reference name="OpenSim.Region.Framework"/>
|
||||||
|
<Reference name="OpenSim.Server.Base"/>
|
||||||
|
<Reference name="OpenSim.Server.Handlers"/>
|
||||||
|
<Reference name="OpenSim.Services.Base"/>
|
||||||
|
<Reference name="OpenSim.Services.Interfaces"/>
|
||||||
|
<Reference name="OpenSim.Tests.Common"/>
|
||||||
|
<Reference name="Nini" path="../../../../bin/"/>
|
||||||
|
<Reference name="log4net" path="../../../../bin/"/>
|
||||||
|
|
||||||
|
<Files>
|
||||||
|
<Match pattern="*.cs" recurse="true">
|
||||||
|
</Match>
|
||||||
|
</Files>
|
||||||
|
</Project>
|
||||||
|
|
||||||
|
|
||||||
<Project frameworkVersion="v3_5" name="OpenSim.Capabilities.Handlers.Tests" path="OpenSim/Capabilities/Handlers" type="Library">
|
<Project frameworkVersion="v3_5" name="OpenSim.Capabilities.Handlers.Tests" path="OpenSim/Capabilities/Handlers" type="Library">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
|
|
Loading…
Reference in New Issue