OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch in the estate series. Introduces the concept of an estate 

owner (alongside the master avatar) and provides storage fo the
abuse email address. No user functionality yet.
This patch includes a migration.
0.6.0-stable
Melanie Thielker 2008-08-01 02:14:34 +00:00
parent 6f975f6eeb
commit 43f3b9ad7b
3 changed files with 30 additions and 0 deletions

7
OpenSim/Data/MySQL/MySQLEstateData.cs
View File

@ -185,6 +185,13 @@ namespace OpenSim.Data.MySQL
else
m_FieldMap[name].SetValue(es, false);
}
else if(m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID)
{
LLUUID uuid = LLUUID.Zero;
LLUUID.TryParse(r[name].ToString(), out uuid);
m_FieldMap[name].SetValue(es, uuid);
}
else
{
m_FieldMap[name].SetValue(es, r[name]);

7
OpenSim/Data/SQLite/SQLiteEstateData.cs
View File

@ -109,6 +109,13 @@ namespace OpenSim.Data.SQLite
else
m_FieldMap[name].SetValue(es, false);
}
else if(m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID)
{
LLUUID uuid = LLUUID.Zero;
LLUUID.TryParse(r[name].ToString(), out uuid);
m_FieldMap[name].SetValue(es, uuid);
}
else
{
m_FieldMap[name].SetValue(es, Convert.ChangeType(r[name], m_FieldMap[name].FieldType));

16
OpenSim/Framework/EstateSettings.cs
View File

@ -215,6 +215,22 @@ namespace OpenSim.Framework
set { m_PublicAccess = value; }
}
private string m_AbuseEmail = String.Empty;
public string AbuseEmail
{
get { return m_AbuseEmail; }
set { m_AbuseEmail= value; }
}
private LLUUID m_EstateOwner = LLUUID.Zero;
public LLUUID EstateOwner
{
get { return m_EstateOwner; }
set { m_EstateOwner = value; }
}
// All those lists...
//
private List<LLUUID> l_EstateManagers = new List<LLUUID>();