diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Cache')
3 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs index 37907a0..091a6a3 100644 --- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs +++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
45 | // Constructors | 45 | // Constructors |
46 | public InventoryFolderImpl(InventoryFolderBase folderbase) | 46 | public InventoryFolderImpl(InventoryFolderBase folderbase) |
47 | { | 47 | { |
48 | AgentID = folderbase.AgentID; | 48 | Owner = folderbase.Owner; |
49 | ID = folderbase.ID; | 49 | ID = folderbase.ID; |
50 | Name = folderbase.Name; | 50 | Name = folderbase.Name; |
51 | ParentID = folderbase.ParentID; | 51 | ParentID = folderbase.ParentID; |
@@ -67,7 +67,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
67 | subFold.ID = folderID; | 67 | subFold.ID = folderID; |
68 | subFold.Type = (short) type; | 68 | subFold.Type = (short) type; |
69 | subFold.ParentID = this.ID; | 69 | subFold.ParentID = this.ID; |
70 | subFold.AgentID = AgentID; | 70 | subFold.Owner = Owner; |
71 | SubFolders.Add(subFold.ID, subFold); | 71 | SubFolders.Add(subFold.ID, subFold); |
72 | return subFold; | 72 | return subFold; |
73 | } | 73 | } |
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index cb82850..03036d0 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
56 | { | 56 | { |
57 | m_log.Info("[LIBRARY INVENTORY]: Loading library inventory"); | 57 | m_log.Info("[LIBRARY INVENTORY]: Loading library inventory"); |
58 | 58 | ||
59 | AgentID = libOwner; | 59 | Owner = libOwner; |
60 | ID = new LLUUID("00000112-000f-0000-0000-000100bba000"); | 60 | ID = new LLUUID("00000112-000f-0000-0000-000100bba000"); |
61 | Name = "OpenSim Library"; | 61 | Name = "OpenSim Library"; |
62 | ParentID = LLUUID.Zero; | 62 | ParentID = LLUUID.Zero; |
@@ -177,7 +177,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
177 | folderInfo.ParentID = new LLUUID(config.GetString("parentFolderID", ID.ToString())); | 177 | folderInfo.ParentID = new LLUUID(config.GetString("parentFolderID", ID.ToString())); |
178 | folderInfo.Type = (short)config.GetInt("type", 8); | 178 | folderInfo.Type = (short)config.GetInt("type", 8); |
179 | 179 | ||
180 | folderInfo.AgentID = libOwner; | 180 | folderInfo.Owner = libOwner; |
181 | folderInfo.Version = 1; | 181 | folderInfo.Version = 1; |
182 | 182 | ||
183 | if (libraryFolders.ContainsKey(folderInfo.ParentID)) | 183 | if (libraryFolders.ContainsKey(folderInfo.ParentID)) |
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index b22c0af..2dc2374 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -113,7 +113,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
113 | if (createdFolder != null) | 113 | if (createdFolder != null) |
114 | { | 114 | { |
115 | InventoryFolderBase createdBaseFolder = new InventoryFolderBase(); | 115 | InventoryFolderBase createdBaseFolder = new InventoryFolderBase(); |
116 | createdBaseFolder.AgentID = createdFolder.AgentID; | 116 | createdBaseFolder.Owner = createdFolder.Owner; |
117 | createdBaseFolder.ID = createdFolder.ID; | 117 | createdBaseFolder.ID = createdFolder.ID; |
118 | createdBaseFolder.Name = createdFolder.Name; | 118 | createdBaseFolder.Name = createdFolder.Name; |
119 | createdBaseFolder.ParentID = createdFolder.ParentID; | 119 | createdBaseFolder.ParentID = createdFolder.ParentID; |
@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
156 | if (userProfile.RootFolder != null) | 156 | if (userProfile.RootFolder != null) |
157 | { | 157 | { |
158 | InventoryFolderBase baseFolder = new InventoryFolderBase(); | 158 | InventoryFolderBase baseFolder = new InventoryFolderBase(); |
159 | baseFolder.AgentID = remoteClient.AgentId; | 159 | baseFolder.Owner = remoteClient.AgentId; |
160 | baseFolder.ID = folderID; | 160 | baseFolder.ID = folderID; |
161 | baseFolder.Name = name; | 161 | baseFolder.Name = name; |
162 | baseFolder.ParentID = parentID; | 162 | baseFolder.ParentID = parentID; |
@@ -176,7 +176,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
176 | if (userProfile.RootFolder != null) | 176 | if (userProfile.RootFolder != null) |
177 | { | 177 | { |
178 | InventoryFolderBase baseFolder = new InventoryFolderBase(); | 178 | InventoryFolderBase baseFolder = new InventoryFolderBase(); |
179 | baseFolder.AgentID = remoteClient.AgentId; | 179 | baseFolder.Owner = remoteClient.AgentId; |
180 | baseFolder.ID = folderID; | 180 | baseFolder.ID = folderID; |
181 | baseFolder.ParentID = parentID; | 181 | baseFolder.ParentID = parentID; |
182 | m_parent.InventoryService.MoveInventoryFolder(remoteClient.AgentId, baseFolder); | 182 | m_parent.InventoryService.MoveInventoryFolder(remoteClient.AgentId, baseFolder); |
@@ -202,7 +202,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
202 | if (folderID == libraryRoot.ID) | 202 | if (folderID == libraryRoot.ID) |
203 | { | 203 | { |
204 | remoteClient.SendInventoryFolderDetails( | 204 | remoteClient.SendInventoryFolderDetails( |
205 | libraryRoot.AgentID, libraryRoot.ID, libraryRoot.RequestListOfItems(), | 205 | libraryRoot.Owner, libraryRoot.ID, libraryRoot.RequestListOfItems(), |
206 | libraryRoot.RequestListOfFolders(), fetchFolders, fetchItems); | 206 | libraryRoot.RequestListOfFolders(), fetchFolders, fetchItems); |
207 | 207 | ||
208 | return; | 208 | return; |
@@ -211,7 +211,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
211 | if ((fold = libraryRoot.HasSubFolder(folderID)) != null) | 211 | if ((fold = libraryRoot.HasSubFolder(folderID)) != null) |
212 | { | 212 | { |
213 | remoteClient.SendInventoryFolderDetails( | 213 | remoteClient.SendInventoryFolderDetails( |
214 | libraryRoot.AgentID, folderID, fold.RequestListOfItems(), | 214 | libraryRoot.Owner, folderID, fold.RequestListOfItems(), |
215 | fold.RequestListOfFolders(), fetchFolders, fetchItems); | 215 | fold.RequestListOfFolders(), fetchFolders, fetchItems); |
216 | 216 | ||
217 | return; | 217 | return; |
@@ -379,7 +379,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
379 | 379 | ||
380 | public void HandleFetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID) | 380 | public void HandleFetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID) |
381 | { | 381 | { |
382 | if (ownerID == libraryRoot.AgentID) | 382 | if (ownerID == libraryRoot.Owner) |
383 | { | 383 | { |
384 | //Console.WriteLine("request info for library item"); | 384 | //Console.WriteLine("request info for library item"); |
385 | 385 | ||