ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.6.9-post-fixes' into careminster

Browse Source
This commit is contained in:
Melanie
2010-03-06 12:24:09 +00:00
parent 62dd83f473 83929c69e3
commit 1f7a0cf892
81 changed files with 2899 additions and 6279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
View File

@@ -39,10 +39,6 @@ namespace OpenSim.Data.MySQL
{
public class MySQLGenericTableHandler<T> : MySqlFramework where T: class, new()
{
private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected Dictionary<string, FieldInfo> m_Fields =
new Dictionary<string, FieldInfo>();

3
OpenSim/Data/MySQL/MySQLXInventoryData.cs
View File

@@ -41,9 +41,6 @@ namespace OpenSim.Data.MySQL
/// </summary>
public class MySQLXInventoryData : IXInventoryData
{
private static readonly ILog m_log = LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
private MySQLGenericTableHandler<XInventoryFolder> m_Folders;
private MySqlItemHandler m_Items;

2
OpenSim/Data/Tests/BasicRegionTest.cs
View File

@@ -524,7 +524,7 @@ namespace OpenSim.Data.Tests
}
}
[Test]
//[Test]
public void T016_RandomSogWithSceneParts()
{
PropertyScrambler<SceneObjectPart> scrambler =