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

Update svn properties. Formatting cleanup. Remove a compiler warning.

0.6.0-stable
Jeff Ames 2008-07-23 13:24:25 +00:00
parent 9e8b456bbc
commit 80d8e2889e
29 changed files with 402 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,9 +101,11 @@ namespace OpenSim.Data.MySQL
BindingFlags.DeclaredOnly); BindingFlags.DeclaredOnly);
foreach (FieldInfo f in m_Fields) foreach (FieldInfo f in m_Fields)
{
if (f.Name.Substring(0, 2) == "m_") if (f.Name.Substring(0, 2) == "m_")
m_FieldMap[f.Name.Substring(2)] = f; m_FieldMap[f.Name.Substring(2)] = f;
} }
}
private string[] FieldList private string[] FieldList
{ {

6
OpenSim/Data/SQLite/SQLiteAssetData.cs
View File

@ -130,7 +130,8 @@ namespace OpenSim.Data.SQLite
} }
else else
{ {
lock(this) { lock (this)
{
using (SqliteCommand cmd = new SqliteCommand(InsertAssetSQL, m_conn)) using (SqliteCommand cmd = new SqliteCommand(InsertAssetSQL, m_conn))
{ {
cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(asset.FullID))); cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(asset.FullID)));
@ -155,7 +156,8 @@ namespace OpenSim.Data.SQLite
{ {
LogAssetLoad(asset); LogAssetLoad(asset);
lock(this) { lock (this)
{
using (SqliteCommand cmd = new SqliteCommand(UpdateAssetSQL, m_conn)) using (SqliteCommand cmd = new SqliteCommand(UpdateAssetSQL, m_conn))
{ {
cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(asset.FullID))); cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(asset.FullID)));

2
OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
View File

@ -40,7 +40,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
/// </summary> /// </summary>
public class AssetsArchiver public class AssetsArchiver
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary> /// <summary>
/// Archive assets /// Archive assets

2
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -1820,9 +1820,11 @@ namespace OpenSim.Region.Environment.Scenes
else else
{ {
foreach (SceneObjectPart p in m_parts.Values) foreach (SceneObjectPart p in m_parts.Values)
{
if (p.LinkNum > linkPart.LinkNum) if (p.LinkNum > linkPart.LinkNum)
p.LinkNum--; p.LinkNum--;
} }
}
linkPart.ParentID = 0; linkPart.ParentID = 0;
linkPart.LinkNum = 0; linkPart.LinkNum = 0;

6
OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
View File

@ -212,8 +212,9 @@ namespace OpenSim.Region.Modules.SvnSerialiser
{ {
m_scenes.Add(scene); m_scenes.Add(scene);
} }
//Only register it once, to prevend command being executed x*region times //Only register it once, to prevent command being executed x*region times
if(m_scenes.Count ==1) { if (m_scenes.Count == 1)
{
scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
} }
} }
@ -341,7 +342,6 @@ namespace OpenSim.Region.Modules.SvnSerialiser
} }
} }
public void LoadAllScenes(int revision) public void LoadAllScenes(int revision)
{ {
CheckoutSvn(new SvnRevision(revision)); CheckoutSvn(new SvnRevision(revision));