aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs8
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs6
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs14
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs2
5 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 4325b93..8391e0a 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -1307,10 +1307,10 @@ namespace OpenSim.Region.ClientStack
1307 foreach (InventoryFolderBase folder in folders) 1307 foreach (InventoryFolderBase folder in folders)
1308 { 1308 {
1309 descend.FolderData[i] = new InventoryDescendentsPacket.FolderDataBlock(); 1309 descend.FolderData[i] = new InventoryDescendentsPacket.FolderDataBlock();
1310 descend.FolderData[i].FolderID = folder.folderID; 1310 descend.FolderData[i].FolderID = folder.ID;
1311 descend.FolderData[i].Name = Helpers.StringToField(folder.name); 1311 descend.FolderData[i].Name = Helpers.StringToField(folder.Name);
1312 descend.FolderData[i].ParentID = folder.parentID; 1312 descend.FolderData[i].ParentID = folder.ParentID;
1313 descend.FolderData[i].Type = (sbyte) folder.type; 1313 descend.FolderData[i].Type = (sbyte) folder.Type;
1314 1314
1315 i++; 1315 i++;
1316 count++; 1316 count++;
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index df735a9..bb3db9d 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Communications.Local
49 //need to make sure we send root folder first 49 //need to make sure we send root folder first
50 foreach (InventoryFolderBase folder in folders) 50 foreach (InventoryFolderBase folder in folders)
51 { 51 {
52 if (folder.parentID == LLUUID.Zero) 52 if (folder.ParentID == LLUUID.Zero)
53 { 53 {
54 rootFolder = RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack); 54 rootFolder = RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack);
55 } 55 }
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Communications.Local
59 { 59 {
60 foreach (InventoryFolderBase folder in folders) 60 foreach (InventoryFolderBase folder in folders)
61 { 61 {
62 if (folder.folderID != rootFolder.folderID) 62 if (folder.ID != rootFolder.ID)
63 { 63 {
64 RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack); 64 RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack);
65 } 65 }
@@ -112,7 +112,7 @@ namespace OpenSim.Region.Communications.Local
112 InventoryFolderImpl newFolder = new InventoryFolderImpl(folder); 112 InventoryFolderImpl newFolder = new InventoryFolderImpl(folder);
113 folderCallBack(userID, newFolder); 113 folderCallBack(userID, newFolder);
114 114
115 List<InventoryItemBase> items = RequestFolderItems(newFolder.folderID); 115 List<InventoryItemBase> items = RequestFolderItems(newFolder.ID);
116 foreach (InventoryItemBase item in items) 116 foreach (InventoryItemBase item in items)
117 { 117 {
118 itemCallBack(userID, item); 118 itemCallBack(userID, item);
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 8583e61..4632716 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -229,16 +229,16 @@ namespace OpenSim.Region.Communications.Local
229 Hashtable TempHash; 229 Hashtable TempHash;
230 foreach (InventoryFolderBase InvFolder in folders) 230 foreach (InventoryFolderBase InvFolder in folders)
231 { 231 {
232 if (InvFolder.parentID == LLUUID.Zero) 232 if (InvFolder.ParentID == LLUUID.Zero)
233 { 233 {
234 rootID = InvFolder.folderID; 234 rootID = InvFolder.ID;
235 } 235 }
236 TempHash = new Hashtable(); 236 TempHash = new Hashtable();
237 TempHash["name"] = InvFolder.name; 237 TempHash["name"] = InvFolder.Name;
238 TempHash["parent_id"] = InvFolder.parentID.ToString(); 238 TempHash["parent_id"] = InvFolder.ParentID.ToString();
239 TempHash["version"] = (Int32) InvFolder.version; 239 TempHash["version"] = (Int32) InvFolder.Version;
240 TempHash["type_default"] = (Int32) InvFolder.type; 240 TempHash["type_default"] = (Int32) InvFolder.Type;
241 TempHash["folder_id"] = InvFolder.folderID.ToString(); 241 TempHash["folder_id"] = InvFolder.ID.ToString();
242 AgentInventoryArray.Add(TempHash); 242 AgentInventoryArray.Add(TempHash);
243 } 243 }
244 244
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index ba2e3d7..3a13f71 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Communications.OGS1
107 InventoryRequest request = m_RequestingInventory[userID]; 107 InventoryRequest request = m_RequestingInventory[userID];
108 foreach (InventoryFolderBase folder in response.Folders) 108 foreach (InventoryFolderBase folder in response.Folders)
109 { 109 {
110 if (folder.parentID == LLUUID.Zero) 110 if (folder.ParentID == LLUUID.Zero)
111 { 111 {
112 InventoryFolderImpl newfolder = new InventoryFolderImpl(folder); 112 InventoryFolderImpl newfolder = new InventoryFolderImpl(folder);
113 rootFolder = newfolder; 113 rootFolder = newfolder;
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Communications.OGS1
119 { 119 {
120 foreach (InventoryFolderBase folder in response.Folders) 120 foreach (InventoryFolderBase folder in response.Folders)
121 { 121 {
122 if (folder.folderID != rootFolder.folderID) 122 if (folder.ID != rootFolder.ID)
123 { 123 {
124 InventoryFolderImpl newfolder = new InventoryFolderImpl(folder); 124 InventoryFolderImpl newfolder = new InventoryFolderImpl(folder);
125 request.FolderCallBack(userID, newfolder); 125 request.FolderCallBack(userID, newfolder);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 052cb02..87f7ace 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -327,7 +327,7 @@ namespace OpenSim.Region.Environment.Scenes
327 itemCopy.Name = item.Name; 327 itemCopy.Name = item.Name;
328 itemCopy.AssetType = item.AssetType; 328 itemCopy.AssetType = item.AssetType;
329 itemCopy.InvType = item.InvType; 329 itemCopy.InvType = item.InvType;
330 itemCopy.Folder = recipientUserInfo.RootFolder.folderID; 330 itemCopy.Folder = recipientUserInfo.RootFolder.ID;
331 itemCopy.CurrentPermissions = 2147483647; 331 itemCopy.CurrentPermissions = 2147483647;
332 itemCopy.NextPermissions = 2147483647; 332 itemCopy.NextPermissions = 2147483647;
333 itemCopy.EveryOnePermissions = item.EveryOnePermissions; 333 itemCopy.EveryOnePermissions = item.EveryOnePermissions;