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

* Optimized usings

Browse Source 
* shortened references
* Removed redundant 'this'
* Normalized EOF
This commit is contained in:
lbsa71
2007-12-27 21:41:48 +00:00
parent d508d77122
commit efd90b56b7
277 changed files with 4685 additions and 4408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs
View File

@@ -313,4 +313,4 @@ namespace OpenSim.Framework.Data.SQLite
#endregion
}
}
}

2
OpenSim/Framework/Data.SQLite/SQLiteBase.cs
View File

@@ -263,4 +263,4 @@ namespace OpenSim.Framework.Data.SQLite
}
}
}
}
}

5
OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
View File

@@ -130,16 +130,17 @@ namespace OpenSim.Framework.Data.SQLite
return row;
}
/// <summary>
/// // Returns a list of avatar and UUIDs that match the query
/// </summary>
public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
{
//Do nothing yet
List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
return returnlist;
}
/// <summary>
/// Adds a new specified region to the database
/// </summary>
@@ -201,4 +202,4 @@ namespace OpenSim.Framework.Data.SQLite
return null;
}
}
}
}

6
OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
View File

@@ -159,6 +159,7 @@ namespace OpenSim.Framework.Data.SQLite
invFoldersDa.Update(ds, "inventoryfolders");
}
private void addItem(InventoryItemBase item)
{
DataTable inventoryItemTable = ds.Tables["inventoryitems"];
@@ -248,7 +249,8 @@ namespace OpenSim.Framework.Data.SQLite
{
List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
string selectExp = "agentID = '" + Util.ToRawUuidString(user) + "' AND parentID = '" + Util.ToRawUuidString(LLUUID.Zero) + "'";
string selectExp = "agentID = '" + Util.ToRawUuidString(user) + "' AND parentID = '" +
Util.ToRawUuidString(LLUUID.Zero) + "'";
DataRow[] rows = inventoryFolderTable.Select(selectExp);
foreach (DataRow row in rows)
{
@@ -627,4 +629,4 @@ namespace OpenSim.Framework.Data.SQLite
return true;
}
}
}
}

2
OpenSim/Framework/Data.SQLite/SQLiteManager.cs
View File

@@ -275,4 +275,4 @@ namespace OpenSim.Framework.Data.SQLite
return returnval;
}
}
}
}

44
OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
View File

@@ -30,7 +30,6 @@ using System.Collections.Generic;
using System.Data;
using libsecondlife;
using Mono.Data.SqliteClient;
using OpenSim.Framework;
using OpenSim.Framework.Console;
namespace OpenSim.Framework.Data.SQLite
@@ -38,7 +37,6 @@ namespace OpenSim.Framework.Data.SQLite
/// <summary>
/// A User storage interface for the SQLite database system
/// </summary>
public class SQLiteUserData : SQLiteBase, IUserData
{
/// <summary>
@@ -119,46 +117,46 @@ namespace OpenSim.Framework.Data.SQLite
}
}
public List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
{
List<OpenSim.Framework.AvatarPickerAvatar> returnlist = new List<OpenSim.Framework.AvatarPickerAvatar>();
List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>();
string[] querysplit;
querysplit = query.Split(' ');
if (querysplit.Length == 2)
if (querysplit.Length == 2)
{
string select = "username like '" + querysplit[0] + "%' and surname like '" + querysplit[1] + "%'";
lock(ds)
lock (ds)
{
DataRow[] rows = ds.Tables["users"].Select(select);
if (rows.Length > 0)
if (rows.Length > 0)
{
for (int i = 0; i < rows.Length; i++)
{
OpenSim.Framework.AvatarPickerAvatar user = new OpenSim.Framework.AvatarPickerAvatar();
Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
DataRow row = rows[i];
user.AvatarID = new LLUUID((string)row["UUID"]);
user.firstName = (string)row["username"];
user.lastName = (string)row["surname"];
user.AvatarID = new LLUUID((string) row["UUID"]);
user.firstName = (string) row["username"];
user.lastName = (string) row["surname"];
returnlist.Add(user);
}
}
}
}
else if (querysplit.Length == 1)
}
else if (querysplit.Length == 1)
{
string select = "username like '" + querysplit[0] + "%' OR surname like '" + querysplit[0] + "%'";
lock(ds)
lock (ds)
{
DataRow[] rows = ds.Tables["users"].Select(select);
if (rows.Length > 0)
if (rows.Length > 0)
{
for (int i = 0;i<rows.Length;i++) {
OpenSim.Framework.AvatarPickerAvatar user = new OpenSim.Framework.AvatarPickerAvatar();
for (int i = 0; i < rows.Length; i++)
{
Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
DataRow row = rows[i];
user.AvatarID = new LLUUID((string)row[0]);
user.firstName = (string)row[1];
user.lastName = (string)row[2];
user.AvatarID = new LLUUID((string) row[0]);
user.firstName = (string) row[1];
user.lastName = (string) row[2];
returnlist.Add(user);
}
}
@@ -166,6 +164,7 @@ namespace OpenSim.Framework.Data.SQLite
}
return returnlist;
}
/// <summary>
/// Returns a user by UUID direct
/// </summary>
@@ -263,7 +262,6 @@ namespace OpenSim.Framework.Data.SQLite
}
else
{
row.Delete();
ua.AcceptChanges();
}
@@ -595,4 +593,4 @@ namespace OpenSim.Framework.Data.SQLite
return true;
}
}
}
}