lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

this removes use of the mapper for wearables, and I can confirm things

Browse Source 
get saved to the database.  There are still issues on wearing things
after a cleared cache that I'm looking at now.
This commit is contained in:
Sean Dague
2008-05-21 18:02:09 +00:00
parent 0b719286a4
commit 53bcf2139e
9 changed files with 151 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
OpenSim/Data/MySQL/MySQLUserData.cs
View File

@@ -34,8 +34,6 @@ using libsecondlife;
using log4net;
using OpenSim.Framework;
using OpenSim.Data.Base;
using OpenSim.Data.MapperFactory;
using OpenSim.Data.MySQLMapper;
namespace OpenSim.Data.MySQL
{
@@ -56,8 +54,6 @@ namespace OpenSim.Data.MySQL
private string m_userFriendsTableName;
private string m_appearanceTableName = "avatarappearance";
private string m_connectString;
private BaseDatabaseConnector m_databaseMapper;
private AppearanceTableMapper m_appearanceMapper;
/// <summary>
/// Loads and initialises the MySQL storage plugin
@@ -107,15 +103,6 @@ namespace OpenSim.Data.MySQL
database = new MySQLManager(m_connectString);
}
string mapperTypeStr = "MySQL";
DataMapperFactory.MAPPER_TYPE mapperType =
(DataMapperFactory.MAPPER_TYPE)
Enum.Parse(typeof (DataMapperFactory.MAPPER_TYPE), mapperTypeStr);
m_databaseMapper = DataMapperFactory.GetDataBaseMapper(mapperType, m_connectString);
m_appearanceMapper = new AppearanceTableMapper(m_databaseMapper, "AvatarAppearance");
TestTables();
}
@@ -203,6 +190,12 @@ namespace OpenSim.Data.MySQL
{
database.ExecuteResourceSql("CreateAvatarAppearance.sql");
return;
}
else if (oldVersion.Contains("Rev.1"))
{
database.ExecuteSql("drop table avatarappearance");
database.ExecuteResourceSql("CreateAvatarAppearance.sql");
return;
}
}
@@ -676,18 +669,35 @@ namespace OpenSim.Data.MySQL
// override
override public AvatarAppearance GetUserAppearance(LLUUID user)
{
AvatarAppearance appearance = null;
if (!m_appearanceMapper.TryGetValue(user.UUID, out appearance))
{
appearance = null;
try {
lock (database)
{
Dictionary<string, string> param = new Dictionary<string, string>();
param["?owner"] = user.ToString();
IDbCommand result = database.Query("SELECT * FROM " + m_appearanceTableName + " WHERE owner = ?owner", param);
IDataReader reader = result.ExecuteReader();
AvatarAppearance appearance = database.readAppearanceRow(reader);
reader.Close();
result.Dispose();
return appearance;
}
}
catch (Exception e)
{
database.Reconnect();
m_log.Error(e.ToString());
return null;
}
return appearance;
}
// override
override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
{
m_appearanceMapper.Update(user.UUID, appearance);
appearance.Owner = user;
database.insertAppearanceRow(appearance);
}
override public void AddAttachment(LLUUID user, LLUUID item)