ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeff Ames
2008-07-23 13:24:25 +00:00
parent 9e8b456bbc
commit 80d8e2889e
29 changed files with 402 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ namespace OpenSim.Data.SQLite
/// <returns>Asset base</returns>
override public AssetBase FetchAsset(LLUUID uuid)
{
lock(this)
lock (this)
{
using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn))
{
@@ -130,7 +130,8 @@ namespace OpenSim.Data.SQLite
}
else
{
lock(this) {
lock (this)
{
using (SqliteCommand cmd = new SqliteCommand(InsertAssetSQL, m_conn))
{
cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(asset.FullID)));
@@ -155,7 +156,8 @@ namespace OpenSim.Data.SQLite
{
LogAssetLoad(asset);
lock(this) {
lock (this)
{
using (SqliteCommand cmd = new SqliteCommand(UpdateAssetSQL, m_conn))
{
cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(asset.FullID)));

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

@@ -74,7 +74,7 @@ namespace OpenSim.Data.SQLite
BindingFlags.DeclaredOnly);
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;
}
@@ -97,14 +97,14 @@ namespace OpenSim.Data.SQLite
IDataReader r = cmd.ExecuteReader();
if(r.Read())
if (r.Read())
{
foreach (string name in FieldList)
{
if(m_FieldMap[name].GetValue(es) is bool)
if (m_FieldMap[name].GetValue(es) is bool)
{
int v = Convert.ToInt32(r[name]);
if(v != 0)
if (v != 0)
m_FieldMap[name].SetValue(es, true);
else
m_FieldMap[name].SetValue(es, false);
@@ -133,9 +133,9 @@ namespace OpenSim.Data.SQLite
foreach (string name in FieldList)
{
if(m_FieldMap[name].GetValue(es) is bool)
if (m_FieldMap[name].GetValue(es) is bool)
{
if((bool)m_FieldMap[name].GetValue(es))
if ((bool)m_FieldMap[name].GetValue(es))
cmd.Parameters.Add(":"+name, "1");
else
cmd.Parameters.Add(":"+name, "0");
@@ -215,9 +215,9 @@ namespace OpenSim.Data.SQLite
foreach (string name in FieldList)
{
if(m_FieldMap[name].GetValue(es) is bool)
if (m_FieldMap[name].GetValue(es) is bool)
{
if((bool)m_FieldMap[name].GetValue(es))
if ((bool)m_FieldMap[name].GetValue(es))
cmd.Parameters.Add(":"+name, "1");
else
cmd.Parameters.Add(":"+name, "0");
@@ -247,7 +247,7 @@ namespace OpenSim.Data.SQLite
IDataReader r = cmd.ExecuteReader();
while(r.Read())
while (r.Read())
{
EstateBan eb = new EstateBan();
@@ -275,7 +275,7 @@ namespace OpenSim.Data.SQLite
cmd.CommandText = "insert into estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask) values ( :EstateID, :bannedUUID, '', '', '' )";
foreach(EstateBan b in es.EstateBans)
foreach (EstateBan b in es.EstateBans)
{
cmd.Parameters.Add(":EstateID", es.EstateID.ToString());
cmd.Parameters.Add(":bannedUUID", b.bannedUUID.ToString());
@@ -298,7 +298,7 @@ namespace OpenSim.Data.SQLite
cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( :EstateID, :uuid )";
foreach(LLUUID uuid in data)
foreach (LLUUID uuid in data)
{
cmd.Parameters.Add(":EstateID", EstateID.ToString());
cmd.Parameters.Add(":uuid", uuid.ToString());
@@ -319,7 +319,7 @@ namespace OpenSim.Data.SQLite
IDataReader r = cmd.ExecuteReader();
while(r.Read())
while (r.Read())
{
// EstateBan eb = new EstateBan();