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

more refactoring, this time on InventoryFolderBase

Browse Source 
* wrap attributes in properties
 * clean up names a little bit
 * clean up name styles
This commit is contained in:
Sean Dague
2008-04-07 23:27:05 +00:00
parent f436815107
commit 5ee75998ce
20 changed files with 348 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ namespace OpenSim.Grid.InventoryServer
foreach (InventoryFolderBase folder in allFolders)
{
List<InventoryItemBase> items = RequestFolderItems(folder.folderID);
List<InventoryItemBase> items = RequestFolderItems(folder.ID);
if (items != null)
{
allItems.InsertRange(0, items);
@@ -79,7 +79,7 @@ namespace OpenSim.Grid.InventoryServer
allFolders.InsertRange(0, folders);
foreach (InventoryFolderBase subfolder in folders)
{
List<InventoryFolderBase> subFolders = GetAllFolders(subfolder.folderID);
List<InventoryFolderBase> subFolders = GetAllFolders(subfolder.ID);
if (subFolders != null)
{
allFolders.InsertRange(0, subFolders);
@@ -166,10 +166,10 @@ namespace OpenSim.Grid.InventoryServer
// Right now, this actions act more like an update/insert combination than a simple create.
m_log.Info(
"[AGENT INVENTORY]: " +
"Updating in " + folder.parentID.ToString()
+ ", folder " + folder.name);
"Updating in " + folder.ParentID.ToString()
+ ", folder " + folder.Name);
AddNewInventoryFolder(folder.agentID, folder);
AddNewInventoryFolder(folder.AgentID, folder);
return true;
}
@@ -177,8 +177,8 @@ namespace OpenSim.Grid.InventoryServer
{
m_log.Info(
"[AGENT INVENTORY]: " +
"Moving folder " + folder.folderID
+ " to " + folder.parentID.ToString());
"Moving folder " + folder.ID
+ " to " + folder.ParentID.ToString());
MoveExistingInventoryFolder(folder);
return true;

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

@@ -104,25 +104,25 @@ namespace OpenSim.Grid.InventoryServer
bool modified = false;
// ensure we have a valid folder id
if (f.folderID == LLUUID.Zero)
if (f.ID == LLUUID.Zero)
{
f.folderID = LLUUID.Random();
f.ID = LLUUID.Random();
modified = true;
}
// ensure we have valid agent id
if (f.agentID == LLUUID.Zero)
if (f.AgentID == LLUUID.Zero)
{
if (parent != null)
f.agentID = parent.agentID;
f.AgentID = parent.AgentID;
else
f.agentID = f.folderID;
f.AgentID = f.ID;
modified = true;
}
if (f.parentID == LLUUID.Zero && parent != null)
if (f.ParentID == LLUUID.Zero && parent != null)
{
f.parentID = parent.folderID;
f.ParentID = parent.ID;
modified = true;
}