ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 12:25:42 +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

8
OpenSim/Region/ClientStack/ClientView.cs
View File

@@ -1307,10 +1307,10 @@ namespace OpenSim.Region.ClientStack
foreach (InventoryFolderBase folder in folders)
{
descend.FolderData[i] = new InventoryDescendentsPacket.FolderDataBlock();
descend.FolderData[i].FolderID = folder.folderID;
descend.FolderData[i].Name = Helpers.StringToField(folder.name);
descend.FolderData[i].ParentID = folder.parentID;
descend.FolderData[i].Type = (sbyte) folder.type;
descend.FolderData[i].FolderID = folder.ID;
descend.FolderData[i].Name = Helpers.StringToField(folder.Name);
descend.FolderData[i].ParentID = folder.ParentID;
descend.FolderData[i].Type = (sbyte) folder.Type;
i++;
count++;

6
OpenSim/Region/Communications/Local/LocalInventoryService.cs
View File

@@ -49,7 +49,7 @@ namespace OpenSim.Region.Communications.Local
//need to make sure we send root folder first
foreach (InventoryFolderBase folder in folders)
{
if (folder.parentID == LLUUID.Zero)
if (folder.ParentID == LLUUID.Zero)
{
rootFolder = RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack);
}
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Communications.Local
{
foreach (InventoryFolderBase folder in folders)
{
if (folder.folderID != rootFolder.folderID)
if (folder.ID != rootFolder.ID)
{
RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack);
}
@@ -112,7 +112,7 @@ namespace OpenSim.Region.Communications.Local
InventoryFolderImpl newFolder = new InventoryFolderImpl(folder);
folderCallBack(userID, newFolder);
List<InventoryItemBase> items = RequestFolderItems(newFolder.folderID);
List<InventoryItemBase> items = RequestFolderItems(newFolder.ID);
foreach (InventoryItemBase item in items)
{
itemCallBack(userID, item);

14
OpenSim/Region/Communications/Local/LocalLoginService.cs
View File

@@ -229,16 +229,16 @@ namespace OpenSim.Region.Communications.Local
Hashtable TempHash;
foreach (InventoryFolderBase InvFolder in folders)
{
if (InvFolder.parentID == LLUUID.Zero)
if (InvFolder.ParentID == LLUUID.Zero)
{
rootID = InvFolder.folderID;
rootID = InvFolder.ID;
}
TempHash = new Hashtable();
TempHash["name"] = InvFolder.name;
TempHash["parent_id"] = InvFolder.parentID.ToString();
TempHash["version"] = (Int32) InvFolder.version;
TempHash["type_default"] = (Int32) InvFolder.type;
TempHash["folder_id"] = InvFolder.folderID.ToString();
TempHash["name"] = InvFolder.Name;
TempHash["parent_id"] = InvFolder.ParentID.ToString();
TempHash["version"] = (Int32) InvFolder.Version;
TempHash["type_default"] = (Int32) InvFolder.Type;
TempHash["folder_id"] = InvFolder.ID.ToString();
AgentInventoryArray.Add(TempHash);
}

4
OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
View File

@@ -107,7 +107,7 @@ namespace OpenSim.Region.Communications.OGS1
InventoryRequest request = m_RequestingInventory[userID];
foreach (InventoryFolderBase folder in response.Folders)
{
if (folder.parentID == LLUUID.Zero)
if (folder.ParentID == LLUUID.Zero)
{
InventoryFolderImpl newfolder = new InventoryFolderImpl(folder);
rootFolder = newfolder;
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Communications.OGS1
{
foreach (InventoryFolderBase folder in response.Folders)
{
if (folder.folderID != rootFolder.folderID)
if (folder.ID != rootFolder.ID)
{
InventoryFolderImpl newfolder = new InventoryFolderImpl(folder);
request.FolderCallBack(userID, newfolder);

2
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@@ -327,7 +327,7 @@ namespace OpenSim.Region.Environment.Scenes
itemCopy.Name = item.Name;
itemCopy.AssetType = item.AssetType;
itemCopy.InvType = item.InvType;
itemCopy.Folder = recipientUserInfo.RootFolder.folderID;
itemCopy.Folder = recipientUserInfo.RootFolder.ID;
itemCopy.CurrentPermissions = 2147483647;
itemCopy.NextPermissions = 2147483647;
itemCopy.EveryOnePermissions = item.EveryOnePermissions;