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

Formatting cleanup.

Browse Source
This commit is contained in:
Jeff Ames
2008-05-16 01:22:11 +00:00
parent e25818d832
commit 65c5efe43b
261 changed files with 3718 additions and 3831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/MSSQL/MSSQLAssetData.cs
View File

@@ -216,7 +216,7 @@ namespace OpenSim.Data.MSSQL
override public string Version
{
// get { return database.getVersion(); }
// get { return database.getVersion(); }
get { return database.getVersion(); }
}

26
OpenSim/Data/MSSQL/MSSQLDataStore.cs
View File

@@ -140,7 +140,7 @@ namespace OpenSim.Data.MSSQL
m_landAccessListTable = createLandAccessListTable();
m_dataSet.Tables.Add(m_landAccessListTable);
setupLandAccessCommands(m_landAccessListDataAdapter, m_connection);
m_landAccessListDataAdapter.Fill(m_landAccessListTable);
m_landAccessListDataAdapter.Fill(m_landAccessListTable);
}
}
@@ -172,7 +172,7 @@ namespace OpenSim.Data.MSSQL
public void RemoveObject(LLUUID obj, LLUUID regionUUID)
{
// Instance.RemoveObject(obj, regionUUID);
m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID);
DataTable prims = m_primTable;
@@ -222,7 +222,7 @@ namespace OpenSim.Data.MSSQL
/// <summary>
/// Load persisted objects from region storage.
/// </summary>
/// </summary>
public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID)
{
// return Instance.LoadObjects(regionUUID);
@@ -328,12 +328,12 @@ namespace OpenSim.Data.MSSQL
TaskInventoryItem item = buildItem(row);
inventory.Add(item);
//m_log.DebugFormat("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID);
//m_log.DebugFormat("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID);
}
prim.RestoreInventoryItems(inventory);
// XXX A nasty little hack to recover the folder id for the prim (which is currently stored in
// XXX A nasty little hack to recover the folder id for the prim (which is currently stored in
// every item). This data should really be stored in the prim table itself.
if (dbItemRows.Length > 0)
{
@@ -527,7 +527,7 @@ namespace OpenSim.Data.MSSQL
/***********************************************************************
*
* Database Definition Functions
*
*
* This should be db agnostic as we define them in ADO.NET terms
*
**********************************************************************/
@@ -742,7 +742,7 @@ namespace OpenSim.Data.MSSQL
}
/***********************************************************************
*
*
* Convert between ADO.NET <=> OpenSim Objects
*
* These should be database independant
@@ -1198,7 +1198,7 @@ namespace OpenSim.Data.MSSQL
m_log.InfoFormat("[REGION DB]: Persisting Prim Inventory with prim ID {0}", primID);
// For now, we're just going to crudely remove all the previous inventory items
// For now, we're just going to crudely remove all the previous inventory items
// no matter whether they have changed or not, and replace them with the current set.
lock (m_dataSet)
{
@@ -1209,7 +1209,7 @@ namespace OpenSim.Data.MSSQL
{
// m_log.InfoFormat(
// "[REGION DB]: " +
// "Adding item {0}, {1} to prim ID {2}",
// "Adding item {0}, {1} to prim ID {2}",
// newItem.Name, newItem.ItemID, newItem.ParentPartID);
DataRow newItemRow = m_itemsTable.NewRow();
@@ -1282,7 +1282,7 @@ namespace OpenSim.Data.MSSQL
sql += subsql;
sql += " where " + pk;
SqlCommand cmd = new SqlCommand(sql);
// this provides the binding for all our parameters, so
// much less code than it used to be
@@ -1329,7 +1329,7 @@ namespace OpenSim.Data.MSSQL
/// This is a convenience function that collapses 5 repetitive
/// lines for defining SqlParameters to 2 parameters:
/// column name and database type.
///
///
/// It assumes certain conventions like :param as the param
/// name to replace in parametrized queries, and that source
/// version is always current version, both of which are fine
@@ -1424,7 +1424,7 @@ namespace OpenSim.Data.MSSQL
SqlCommand tcmd = new SqlCommand(createTerrain, conn);
SqlCommand lcmd = new SqlCommand(createLand, conn);
SqlCommand lalcmd = new SqlCommand(createLandAccessList, conn);
conn.Open();
try
{
@@ -1604,6 +1604,6 @@ namespace OpenSim.Data.MSSQL
{
return DbType.String;
}
}
}
}
}

18
OpenSim/Data/MSSQL/MSSQLGridData.cs
View File

@@ -79,7 +79,7 @@ namespace OpenSim.Data.MSSQL
private void TestTables()
{
IDbCommand cmd = database.Query("SELECT TOP 1 * FROM "+m_regionsTableName, new Dictionary<string, string>());
try
{
cmd.ExecuteNonQuery();
@@ -88,7 +88,7 @@ namespace OpenSim.Data.MSSQL
catch (Exception)
{
m_log.Info("[GRID DB]: MSSQL Database doesn't exist... creating");
database.ExecuteResourceSql("Mssql-regions.sql");
database.ExecuteResourceSql("Mssql-regions.sql");
}
}
@@ -161,7 +161,7 @@ namespace OpenSim.Data.MSSQL
}
return null;
}
/// <summary>
/// Returns a sim profile from its UUID
/// </summary>
@@ -255,17 +255,17 @@ namespace OpenSim.Data.MSSQL
{
//Insert new region
string sql =
"UPDATE " + m_regionsTableName + @" SET
[regionHandle]=@regionHandle, [regionName]=@regionName,
"UPDATE " + m_regionsTableName + @" SET
[regionHandle]=@regionHandle, [regionName]=@regionName,
[regionRecvKey]=@regionRecvKey, [regionSecret]=@regionSecret, [regionSendKey]=@regionSendKey,
[regionDataURI]=@regionDataURI, [serverIP]=@serverIP, [serverPort]=@serverPort, [serverURI]=@serverURI,
[locX]=@locX, [locY]=@locY, [locZ]=@locZ, [eastOverrideHandle]=@eastOverrideHandle,
[westOverrideHandle]=@westOverrideHandle, [southOverrideHandle]=@southOverrideHandle,
[northOverrideHandle]=@northOverrideHandle, [regionAssetURI]=@regionAssetURI,
[locX]=@locX, [locY]=@locY, [locZ]=@locZ, [eastOverrideHandle]=@eastOverrideHandle,
[westOverrideHandle]=@westOverrideHandle, [southOverrideHandle]=@southOverrideHandle,
[northOverrideHandle]=@northOverrideHandle, [regionAssetURI]=@regionAssetURI,
[regionAssetRecvKey]=@regionAssetRecvKey, [regionAssetSendKey]=@regionAssetSendKey,
[regionUserURI]=@regionUserURI, [regionUserRecvKey]=@regionUserRecvKey, [regionUserSendKey]=@regionUserSendKey,
[regionMapTexture]=@regionMapTexture, [serverHttpPort]=@serverHttpPort,
[serverRemotingPort]=@serverRemotingPort, [owner_uuid]=@owner_uuid
[serverRemotingPort]=@serverRemotingPort, [owner_uuid]=@owner_uuid
where [uuid]=@uuid";
Dictionary<string, string> parameters = new Dictionary<string, string>();

16
OpenSim/Data/MSSQL/MSSQLInventoryData.cs
View File

@@ -80,7 +80,7 @@ namespace OpenSim.Data.MSSQL
if (tableName == null)
{
database.ExecuteResourceSql("CreateFoldersTable.sql");
//database.ExecuteResourceSql("UpgradeFoldersTableToVersion2.sql");
//database.ExecuteResourceSql("UpgradeFoldersTableToVersion2.sql");
return;
}
}
@@ -236,9 +236,9 @@ namespace OpenSim.Data.MSSQL
// There should only ever be one root folder for a user. However, if there's more
// than one we'll simply use the first one rather than failing. It would be even
// nicer to print some message to this effect, but this feels like it's too low a
// nicer to print some message to this effect, but this feels like it's too low a
// to put such a message out, and it's too minor right now to spare the time to
// suitably refactor.
// suitably refactor.
if (items.Count > 0)
{
rootFolder = items[0];
@@ -326,7 +326,7 @@ namespace OpenSim.Data.MSSQL
item.GroupID = new LLUUID(reader["groupID"].ToString());
item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]);
item.Flags = (uint) reader["flags"];
return item;
}
catch (SqlException e)
@@ -455,7 +455,7 @@ namespace OpenSim.Data.MSSQL
+ ", @inventoryNextPermissions, @inventoryCurrentPermissions, @invType, @creatorID"
+ ", @inventoryBasePermissions, @inventoryEveryOnePermissions, @salePrice, @saleType"
+ ", @creationDate, @groupID, @groupOwned, @flags);";
try
{
Dictionary<string, string> param = new Dictionary<string, string>();
@@ -472,7 +472,7 @@ namespace OpenSim.Data.MSSQL
param["creatorID"] = item.Creator.ToString();
param["inventoryBasePermissions"] = Convert.ToString(item.BasePermissions);
param["inventoryEveryOnePermissions"] = Convert.ToString(item.EveryOnePermissions);
param["salePrice"] = Convert.ToString(item.SalePrice);
param["saleType"] = Convert.ToString(item.SaleType);
param["creationDate"] = Convert.ToString(item.CreationDate);
@@ -550,7 +550,7 @@ namespace OpenSim.Data.MSSQL
}
/// <summary>
///
///
/// </summary>
/// <param name="item"></param>
public void deleteInventoryItem(LLUUID itemID)
@@ -667,7 +667,7 @@ namespace OpenSim.Data.MSSQL
}
/// <summary>
/// Append a list of all the child folders of a parent folder
/// Append a list of all the child folders of a parent folder
/// </summary>
/// <param name="folders">list where folders will be appended</param>
/// <param name="parentID">ID of parent</param>

4
OpenSim/Data/MSSQL/MSSQLManager.cs
View File

@@ -442,7 +442,7 @@ namespace OpenSim.Data.MSSQL
return returnval;
}
/// <summary>
/// Execute a SQL statement stored in a resource, as a string
/// </summary>
@@ -509,7 +509,7 @@ namespace OpenSim.Data.MSSQL
throw new Exception(string.Format("Resource '{0}' was not found", name));
}
/// <summary>
/// <summary>
/// Returns the version of this DB provider
/// </summary>
/// <returns>A string containing the DB provider</returns>

8
OpenSim/Data/MSSQL/MSSQLUserData.cs
View File

@@ -105,7 +105,7 @@ namespace OpenSim.Data.MSSQL
{
database.ExecuteResourceSql("Mssql-users.sql");
}
cmd = database.Query("select top 1 * from " + m_agentsTableName, new Dictionary<string, string>());
try
{
@@ -747,7 +747,7 @@ namespace OpenSim.Data.MSSQL
/// Appearance
/// TODO: stubs for now to get us to a compiling state gently
// override public AvatarAppearance GetUserAppearance(LLUUID user)
// override public AvatarAppearance GetUserAppearance(LLUUID user)
// {
// return new AvatarAppearance();
// }
@@ -761,12 +761,12 @@ namespace OpenSim.Data.MSSQL
{
return;
}
override public void RemoveAttachment(LLUUID user, LLUUID item)
{
return;
}
override public List<LLUUID> GetAttachments(LLUUID user)
{
return new List<LLUUID>();

10
OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs
View File

@@ -28,7 +28,7 @@
using System.Reflection;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// General information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices;
[assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly : ComVisible(false)]
@@ -54,11 +54,11 @@ using System.Runtime.InteropServices;
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly : AssemblyVersion("1.0.0.0")]