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

further refactor and rename of InventoryFolderBase properties 

to reflect what they really are.
0.6.0-stable
Sean Dague 2008-04-08 23:26:31 +00:00
parent 8c82117207
commit a6d27e0929
12 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,7 +370,7 @@ namespace OpenSim.Data.MSSQL
try try
{ {
InventoryFolderBase folder = new InventoryFolderBase(); InventoryFolderBase folder = new InventoryFolderBase();
folder.AgentID = new LLUUID((string) reader["agentID"]); folder.Owner = new LLUUID((string) reader["agentID"]);
folder.ParentID = new LLUUID((string) reader["parentFolderID"]); folder.ParentID = new LLUUID((string) reader["parentFolderID"]);
folder.ID = new LLUUID((string) reader["folderID"]); folder.ID = new LLUUID((string) reader["folderID"]);
folder.Name = (string) reader["folderName"]; folder.Name = (string) reader["folderName"];
@ -558,7 +558,7 @@ namespace OpenSim.Data.MSSQL
Dictionary<string, string> param = new Dictionary<string, string>(); Dictionary<string, string> param = new Dictionary<string, string>();
param["folderID"] = folder.ID.ToString(); param["folderID"] = folder.ID.ToString();
param["agentID"] = folder.AgentID.ToString(); param["agentID"] = folder.Owner.ToString();
param["parentFolderID"] = folder.ParentID.ToString(); param["parentFolderID"] = folder.ParentID.ToString();
param["folderName"] = folder.Name; param["folderName"] = folder.Name;
param["type"] = Convert.ToString(folder.Type); param["type"] = Convert.ToString(folder.Type);
@ -590,7 +590,7 @@ namespace OpenSim.Data.MSSQL
"version = @version where " + "version = @version where " +
"folderID = @keyFolderID;", database.getConnection()); "folderID = @keyFolderID;", database.getConnection());
SqlParameter param1 = new SqlParameter("@folderID", folder.ID.ToString()); SqlParameter param1 = new SqlParameter("@folderID", folder.ID.ToString());
SqlParameter param2 = new SqlParameter("@agentID", folder.AgentID.ToString()); SqlParameter param2 = new SqlParameter("@agentID", folder.Owner.ToString());
SqlParameter param3 = new SqlParameter("@parentFolderID", folder.ParentID.ToString()); SqlParameter param3 = new SqlParameter("@parentFolderID", folder.ParentID.ToString());
SqlParameter param4 = new SqlParameter("@folderName", folder.Name); SqlParameter param4 = new SqlParameter("@folderName", folder.Name);
SqlParameter param5 = new SqlParameter("@type", folder.Type); SqlParameter param5 = new SqlParameter("@type", folder.Type);

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

@ -381,7 +381,7 @@ namespace OpenSim.Data.MySQL
try try
{ {
InventoryFolderBase folder = new InventoryFolderBase(); InventoryFolderBase folder = new InventoryFolderBase();
folder.AgentID = new LLUUID((string) reader["agentID"]); folder.Owner = new LLUUID((string) reader["agentID"]);
folder.ParentID = new LLUUID((string) reader["parentFolderID"]); folder.ParentID = new LLUUID((string) reader["parentFolderID"]);
folder.ID = new LLUUID((string) reader["folderID"]); folder.ID = new LLUUID((string) reader["folderID"]);
folder.Name = (string) reader["folderName"]; folder.Name = (string) reader["folderName"];
@ -508,7 +508,7 @@ namespace OpenSim.Data.MySQL
MySqlCommand cmd = new MySqlCommand(sql, database.Connection); MySqlCommand cmd = new MySqlCommand(sql, database.Connection);
cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString()); cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
cmd.Parameters.AddWithValue("?agentID", folder.AgentID.ToString()); cmd.Parameters.AddWithValue("?agentID", folder.Owner.ToString());
cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString()); cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
cmd.Parameters.AddWithValue("?folderName", folder.Name); cmd.Parameters.AddWithValue("?folderName", folder.Name);
cmd.Parameters.AddWithValue("?type", (short) folder.Type); cmd.Parameters.AddWithValue("?type", (short) folder.Type);

8
OpenSim/Data/NHibernate/NHibernateInventoryData.cs
View File

@ -73,11 +73,11 @@ namespace OpenSim.Data.NHibernate
cfg.AddAssembly("OpenSim.Data.NHibernate"); cfg.AddAssembly("OpenSim.Data.NHibernate");
HbmSerializer.Default.Validate = true; HbmSerializer.Default.Validate = true;
// using ( System.IO.MemoryStream stream = using ( System.IO.MemoryStream stream =
// HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly())) HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly()))
// cfg.AddInputStream(stream); cfg.AddInputStream(stream);
// new SchemaExport(cfg).Create(true, true); new SchemaExport(cfg).Create(true, true);
factory = cfg.BuildSessionFactory(); factory = cfg.BuildSessionFactory();
} }

4
OpenSim/Data/SQLite/SQLiteInventoryStore.cs
View File

@ -592,7 +592,7 @@ namespace OpenSim.Data.SQLite
InventoryFolderBase folder = new InventoryFolderBase(); InventoryFolderBase folder = new InventoryFolderBase();
folder.ID = new LLUUID((string) row["UUID"]); folder.ID = new LLUUID((string) row["UUID"]);
folder.Name = (string) row["name"]; folder.Name = (string) row["name"];
folder.AgentID = new LLUUID((string) row["agentID"]); folder.Owner = new LLUUID((string) row["agentID"]);
folder.ParentID = new LLUUID((string) row["parentID"]); folder.ParentID = new LLUUID((string) row["parentID"]);
folder.Type = Convert.ToInt16(row["type"]); folder.Type = Convert.ToInt16(row["type"]);
folder.Version = Convert.ToUInt16(row["version"]); folder.Version = Convert.ToUInt16(row["version"]);
@ -603,7 +603,7 @@ namespace OpenSim.Data.SQLite
{ {
row["UUID"] = Util.ToRawUuidString(folder.ID); row["UUID"] = Util.ToRawUuidString(folder.ID);
row["name"] = folder.Name; row["name"] = folder.Name;
row["agentID"] = Util.ToRawUuidString(folder.AgentID); row["agentID"] = Util.ToRawUuidString(folder.Owner);
row["parentID"] = Util.ToRawUuidString(folder.ParentID); row["parentID"] = Util.ToRawUuidString(folder.ParentID);
row["type"] = folder.Type; row["type"] = folder.Type;
row["version"] = folder.Version; row["version"] = folder.Version;

4
OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
View File

@ -45,7 +45,7 @@ namespace OpenSim.Framework.Communications.Cache
// Constructors // Constructors
public InventoryFolderImpl(InventoryFolderBase folderbase) public InventoryFolderImpl(InventoryFolderBase folderbase)
{ {
AgentID = folderbase.AgentID; Owner = folderbase.Owner;
ID = folderbase.ID; ID = folderbase.ID;
Name = folderbase.Name; Name = folderbase.Name;
ParentID = folderbase.ParentID; ParentID = folderbase.ParentID;
@ -67,7 +67,7 @@ namespace OpenSim.Framework.Communications.Cache
subFold.ID = folderID; subFold.ID = folderID;
subFold.Type = (short) type; subFold.Type = (short) type;
subFold.ParentID = this.ID; subFold.ParentID = this.ID;
subFold.AgentID = AgentID; subFold.Owner = Owner;
SubFolders.Add(subFold.ID, subFold); SubFolders.Add(subFold.ID, subFold);
return subFold; return subFold;
} }

4
OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
View File

@ -56,7 +56,7 @@ namespace OpenSim.Framework.Communications.Cache
{ {
m_log.Info("[LIBRARY INVENTORY]: Loading library inventory"); m_log.Info("[LIBRARY INVENTORY]: Loading library inventory");
AgentID = libOwner; Owner = libOwner;
ID = new LLUUID("00000112-000f-0000-0000-000100bba000"); ID = new LLUUID("00000112-000f-0000-0000-000100bba000");
Name = "OpenSim Library"; Name = "OpenSim Library";
ParentID = LLUUID.Zero; ParentID = LLUUID.Zero;
@ -177,7 +177,7 @@ namespace OpenSim.Framework.Communications.Cache
folderInfo.ParentID = new LLUUID(config.GetString("parentFolderID", ID.ToString())); folderInfo.ParentID = new LLUUID(config.GetString("parentFolderID", ID.ToString()));
folderInfo.Type = (short)config.GetInt("type", 8); folderInfo.Type = (short)config.GetInt("type", 8);
folderInfo.AgentID = libOwner; folderInfo.Owner = libOwner;
folderInfo.Version = 1; folderInfo.Version = 1;
if (libraryFolders.ContainsKey(folderInfo.ParentID)) if (libraryFolders.ContainsKey(folderInfo.ParentID))

12
OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
View File

@ -113,7 +113,7 @@ namespace OpenSim.Framework.Communications.Cache
if (createdFolder != null) if (createdFolder != null)
{ {
InventoryFolderBase createdBaseFolder = new InventoryFolderBase(); InventoryFolderBase createdBaseFolder = new InventoryFolderBase();
createdBaseFolder.AgentID = createdFolder.AgentID; createdBaseFolder.Owner = createdFolder.Owner;
createdBaseFolder.ID = createdFolder.ID; createdBaseFolder.ID = createdFolder.ID;
createdBaseFolder.Name = createdFolder.Name; createdBaseFolder.Name = createdFolder.Name;
createdBaseFolder.ParentID = createdFolder.ParentID; createdBaseFolder.ParentID = createdFolder.ParentID;
@ -156,7 +156,7 @@ namespace OpenSim.Framework.Communications.Cache
if (userProfile.RootFolder != null) if (userProfile.RootFolder != null)
{ {
InventoryFolderBase baseFolder = new InventoryFolderBase(); InventoryFolderBase baseFolder = new InventoryFolderBase();
baseFolder.AgentID = remoteClient.AgentId; baseFolder.Owner = remoteClient.AgentId;
baseFolder.ID = folderID; baseFolder.ID = folderID;
baseFolder.Name = name; baseFolder.Name = name;
baseFolder.ParentID = parentID; baseFolder.ParentID = parentID;
@ -176,7 +176,7 @@ namespace OpenSim.Framework.Communications.Cache
if (userProfile.RootFolder != null) if (userProfile.RootFolder != null)
{ {
InventoryFolderBase baseFolder = new InventoryFolderBase(); InventoryFolderBase baseFolder = new InventoryFolderBase();
baseFolder.AgentID = remoteClient.AgentId; baseFolder.Owner = remoteClient.AgentId;
baseFolder.ID = folderID; baseFolder.ID = folderID;
baseFolder.ParentID = parentID; baseFolder.ParentID = parentID;
m_parent.InventoryService.MoveInventoryFolder(remoteClient.AgentId, baseFolder); m_parent.InventoryService.MoveInventoryFolder(remoteClient.AgentId, baseFolder);
@ -202,7 +202,7 @@ namespace OpenSim.Framework.Communications.Cache
if (folderID == libraryRoot.ID) if (folderID == libraryRoot.ID)
{ {
remoteClient.SendInventoryFolderDetails( remoteClient.SendInventoryFolderDetails(
libraryRoot.AgentID, libraryRoot.ID, libraryRoot.RequestListOfItems(), libraryRoot.Owner, libraryRoot.ID, libraryRoot.RequestListOfItems(),
libraryRoot.RequestListOfFolders(), fetchFolders, fetchItems); libraryRoot.RequestListOfFolders(), fetchFolders, fetchItems);
return; return;
@ -211,7 +211,7 @@ namespace OpenSim.Framework.Communications.Cache
if ((fold = libraryRoot.HasSubFolder(folderID)) != null) if ((fold = libraryRoot.HasSubFolder(folderID)) != null)
{ {
remoteClient.SendInventoryFolderDetails( remoteClient.SendInventoryFolderDetails(
libraryRoot.AgentID, folderID, fold.RequestListOfItems(), libraryRoot.Owner, folderID, fold.RequestListOfItems(),
fold.RequestListOfFolders(), fetchFolders, fetchItems); fold.RequestListOfFolders(), fetchFolders, fetchItems);
return; return;
@ -379,7 +379,7 @@ namespace OpenSim.Framework.Communications.Cache
public void HandleFetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID) public void HandleFetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID)
{ {
if (ownerID == libraryRoot.AgentID) if (ownerID == libraryRoot.Owner)
{ {
//Console.WriteLine("request info for library item"); //Console.WriteLine("request info for library item");

2
OpenSim/Framework/Communications/CommunicationsManager.cs
View File

@ -240,7 +240,7 @@ namespace OpenSim.Framework.Communications
public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client) public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)
{ {
if (uuid == m_userProfileCacheService.libraryRoot.AgentID) if (uuid == m_userProfileCacheService.libraryRoot.Owner)
{ {
remote_client.SendNameReply(uuid, "Mr", "OpenSim"); remote_client.SendNameReply(uuid, "Mr", "OpenSim");
} }

30
OpenSim/Framework/Communications/InventoryServiceBase.cs
View File

@ -240,7 +240,7 @@ namespace OpenSim.Framework.Communications
InventoryFolderBase folder = new InventoryFolderBase(); InventoryFolderBase folder = new InventoryFolderBase();
folder.ParentID = LLUUID.Zero; folder.ParentID = LLUUID.Zero;
folder.AgentID = user; folder.Owner = user;
folder.ID = LLUUID.Random(); folder.ID = LLUUID.Random();
folder.Name = "My Inventory"; folder.Name = "My Inventory";
folder.Type = (short)AssetType.Folder; folder.Type = (short)AssetType.Folder;
@ -251,7 +251,7 @@ namespace OpenSim.Framework.Communications
folder = new InventoryFolderBase(); folder = new InventoryFolderBase();
folder.ParentID = rootFolder; folder.ParentID = rootFolder;
folder.AgentID = user; folder.Owner = user;
folder.ID = LLUUID.Random(); folder.ID = LLUUID.Random();
folder.Name = "Animations"; folder.Name = "Animations";
folder.Type = (short)AssetType.Animation; folder.Type = (short)AssetType.Animation;
@ -260,7 +260,7 @@ namespace OpenSim.Framework.Communications
folder = new InventoryFolderBase(); folder = new InventoryFolderBase();
folder.ParentID = rootFolder; folder.ParentID = rootFolder;
folder.AgentID = user; folder.Owner = user;
folder.ID = LLUUID.Random(); folder.ID = LLUUID.Random();
folder.Name = "Body Parts"; folder.Name = "Body Parts";
folder.Type = (short)AssetType.Bodypart; folder.Type = (short)AssetType.Bodypart;
@ -269,7 +269,7 @@ namespace OpenSim.Framework.Communications
folder = new InventoryFolderBase(); folder = new InventoryFolderBase();
folder.ParentID = rootFolder; folder.ParentID = rootFolder;
folder.AgentID = user; folder.Owner = user;
folder.ID = LLUUID.Random(); folder.ID = LLUUID.Random();
folder.Name = "Calling Cards"; folder.Name = "Calling Cards";
folder.Type = (short)AssetType.CallingCard; folder.Type = (short)AssetType.CallingCard;
@ -278,7 +278,7 @@ namespace OpenSim.Framework.Communications
folder = new InventoryFolderBase(); folder = new InventoryFolderBase();
folder.ParentID = rootFolder; folder.ParentID = rootFolder;
folder.AgentID = user; folder.Owner = user;
folder.ID = LLUUID.Random(); folder.ID = LLUUID.Random();
folder.Name = "Clothing"; folder.Name = "Clothing";
folder.Type = (short)AssetType.Clothing; folder.Type = (short)AssetType.Clothing;
@ -287,7 +287,7 @@ namespace OpenSim.Framework.Communications
folder = new InventoryFolderBase(); folder = new InventoryFolderBase();
folder.ParentID = rootFolder; folder.ParentID = rootFolder;
folder.AgentID = user; folder.Owner = user;
folder.ID = LLUUID.Random(); folder.ID = LLUUID.Random();
folder.Name = "Gestures"; folder.Name = "Gestures";
folder.Type = (short)AssetType.Gesture; folder.Type = (short)AssetType.Gesture;
@ -296,7 +296,7 @@ namespace OpenSim.Framework.Communications
folder = new InventoryFolderBase(); folder = new InventoryFolderBase();
folder.ParentID = rootFolder; folder.ParentID = rootFolder;
folder.AgentID = user; folder.Owner = user;
folder.ID = LLUUID.Random(); folder.ID = LLUUID.Random();
folder.Name = "Landmarks"; folder.Name = "Landmarks";
folder.Type = (short)AssetType.Landmark; folder.Type = (short)AssetType.Landmark;
@ -305,7 +305,7 @@ namespace OpenSim.Framework.Communications
folder = new InventoryFolderBase(); folder = new InventoryFolderBase();
folder.ParentID = rootFolder; folder.ParentID = rootFolder;
folder.AgentID = user; folder.Owner = user;
folder.ID = LLUUID.Random(); folder.ID = LLUUID.Random();
folder.Name = "Lost And Found"; folder.Name = "Lost And Found";
folder.Type = (short)AssetType.LostAndFoundFolder; folder.Type = (short)AssetType.LostAndFoundFolder;
@ -314,7 +314,7 @@ namespace OpenSim.Framework.Communications
folder = new InventoryFolderBase(); folder = new InventoryFolderBase();
folder.ParentID = rootFolder; folder.ParentID = rootFolder;
folder.AgentID = user; folder.Owner = user;
folder.ID = LLUUID.Random(); folder.ID = LLUUID.Random();
folder.Name = "Notecards"; folder.Name = "Notecards";
folder.Type = (short)AssetType.Notecard; folder.Type = (short)AssetType.Notecard;
@ -323,7 +323,7 @@ namespace OpenSim.Framework.Communications
folder = new InventoryFolderBase(); folder = new InventoryFolderBase();
folder.ParentID = rootFolder; folder.ParentID = rootFolder;
folder.AgentID = user; folder.Owner = user;
folder.ID = LLUUID.Random(); folder.ID = LLUUID.Random();
folder.Name = "Objects"; folder.Name = "Objects";
folder.Type = (short)AssetType.Object; folder.Type = (short)AssetType.Object;
@ -332,7 +332,7 @@ namespace OpenSim.Framework.Communications
folder = new InventoryFolderBase(); folder = new InventoryFolderBase();
folder.ParentID = rootFolder; folder.ParentID = rootFolder;
folder.AgentID = user; folder.Owner = user;
folder.ID = LLUUID.Random(); folder.ID = LLUUID.Random();
folder.Name = "Photo Album"; folder.Name = "Photo Album";
folder.Type = (short)AssetType.SnapshotFolder; folder.Type = (short)AssetType.SnapshotFolder;
@ -341,7 +341,7 @@ namespace OpenSim.Framework.Communications
folder = new InventoryFolderBase(); folder = new InventoryFolderBase();
folder.ParentID = rootFolder; folder.ParentID = rootFolder;
folder.AgentID = user; folder.Owner = user;
folder.ID = LLUUID.Random(); folder.ID = LLUUID.Random();
folder.Name = "Scripts"; folder.Name = "Scripts";
folder.Type = (short)AssetType.LSLText; folder.Type = (short)AssetType.LSLText;
@ -350,7 +350,7 @@ namespace OpenSim.Framework.Communications
folder = new InventoryFolderBase(); folder = new InventoryFolderBase();
folder.ParentID = rootFolder; folder.ParentID = rootFolder;
folder.AgentID = user; folder.Owner = user;
folder.ID = LLUUID.Random(); folder.ID = LLUUID.Random();
folder.Name = "Sounds"; folder.Name = "Sounds";
folder.Type = (short)AssetType.Sound; folder.Type = (short)AssetType.Sound;
@ -359,7 +359,7 @@ namespace OpenSim.Framework.Communications
folder = new InventoryFolderBase(); folder = new InventoryFolderBase();
folder.ParentID = rootFolder; folder.ParentID = rootFolder;
folder.AgentID = user; folder.Owner = user;
folder.ID = LLUUID.Random(); folder.ID = LLUUID.Random();
folder.Name = "Textures"; folder.Name = "Textures";
folder.Type = (short)AssetType.Texture; folder.Type = (short)AssetType.Texture;
@ -368,7 +368,7 @@ namespace OpenSim.Framework.Communications
folder = new InventoryFolderBase(); folder = new InventoryFolderBase();
folder.ParentID = rootFolder; folder.ParentID = rootFolder;
folder.AgentID = user; folder.Owner = user;
folder.ID = LLUUID.Random(); folder.ID = LLUUID.Random();
folder.Name = "Trash"; folder.Name = "Trash";
folder.Type = (short)AssetType.TrashFolder; folder.Type = (short)AssetType.TrashFolder;

8
OpenSim/Framework/InventoryFolderBase.cs
View File

@ -45,7 +45,7 @@ namespace OpenSim.Framework
/// <summary> /// <summary>
/// The agent who's inventory this is contained by /// The agent who's inventory this is contained by
/// </summary> /// </summary>
private LLUUID _agentID; private LLUUID _owner;
/// <summary> /// <summary>
/// The folder this folder is contained in /// The folder this folder is contained in
@ -76,12 +76,12 @@ namespace OpenSim.Framework
} }
} }
public LLUUID AgentID { public LLUUID Owner {
get { get {
return _agentID; return _owner;
} }
set { set {
_agentID = value; _owner = value;
} }
} }

2
OpenSim/Grid/InventoryServer/GridInventoryService.cs
View File

@ -169,7 +169,7 @@ namespace OpenSim.Grid.InventoryServer
"Updating in " + folder.ParentID.ToString() "Updating in " + folder.ParentID.ToString()
+ ", folder " + folder.Name); + ", folder " + folder.Name);
AddNewInventoryFolder(folder.AgentID, folder); AddNewInventoryFolder(folder.Owner, folder);
return true; return true;
} }

6
OpenSim/Grid/InventoryServer/InventoryManager.cs
View File

@ -111,12 +111,12 @@ namespace OpenSim.Grid.InventoryServer
} }
// ensure we have valid agent id // ensure we have valid agent id
if (f.AgentID == LLUUID.Zero) if (f.Owner == LLUUID.Zero)
{ {
if (parent != null) if (parent != null)
f.AgentID = parent.AgentID; f.Owner = parent.Owner;
else else
f.AgentID = f.ID; f.Owner = f.ID;
modified = true; modified = true;
} }