diff options
author | Justin Clarke Casey | 2007-12-21 19:47:45 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2007-12-21 19:47:45 +0000 |
commit | 42bc256e4fdd1b978b59fba117a78899b5a25c49 (patch) | |
tree | de77069b77bfa31ea3709267affc7a3425617eb6 /OpenSim/Framework | |
parent | * Fixed UserServer crash when it's passed 00000000000000000000000000 as the U... (diff) | |
download | opensim-SC-42bc256e4fdd1b978b59fba117a78899b5a25c49.zip opensim-SC-42bc256e4fdd1b978b59fba117a78899b5a25c49.tar.gz opensim-SC-42bc256e4fdd1b978b59fba117a78899b5a25c49.tar.bz2 opensim-SC-42bc256e4fdd1b978b59fba117a78899b5a25c49.tar.xz |
Refix bug where inventory textures don't appear in prim edit texture selection box
unless previously expanded in inventory.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | 21 | ||||
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 4 |
2 files changed, 18 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index bf7f5c1..6a7be78 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -176,11 +176,14 @@ namespace OpenSim.Framework.Communications.Cache | |||
176 | public void HandleFetchInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, | 176 | public void HandleFetchInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, |
177 | bool fetchFolders, bool fetchItems, int sortOrder) | 177 | bool fetchFolders, bool fetchItems, int sortOrder) |
178 | { | 178 | { |
179 | // XXX We're not handling sortOrder yet! | ||
180 | |||
179 | InventoryFolderImpl fold = null; | 181 | InventoryFolderImpl fold = null; |
180 | if (folderID == libraryRoot.folderID) | 182 | if (folderID == libraryRoot.folderID) |
181 | { | 183 | { |
182 | remoteClient.SendInventoryFolderDetails(libraryRoot.agentID, libraryRoot.folderID, | 184 | remoteClient.SendInventoryFolderDetails( |
183 | libraryRoot.RequestListOfItems(), libraryRoot.RequestListOfFolders(), libraryRoot.SubFoldersCount); | 185 | libraryRoot.agentID, libraryRoot.folderID, libraryRoot.RequestListOfItems(), |
186 | libraryRoot.RequestListOfFolders(), fetchFolders, fetchItems); | ||
184 | 187 | ||
185 | return; | 188 | return; |
186 | } | 189 | } |
@@ -188,7 +191,9 @@ namespace OpenSim.Framework.Communications.Cache | |||
188 | if ((fold = libraryRoot.HasSubFolder(folderID)) != null) | 191 | if ((fold = libraryRoot.HasSubFolder(folderID)) != null) |
189 | { | 192 | { |
190 | System.Console.WriteLine("fetching librarysubfolder"); | 193 | System.Console.WriteLine("fetching librarysubfolder"); |
191 | remoteClient.SendInventoryFolderDetails(libraryRoot.agentID, folderID, fold.RequestListOfItems(), fold.RequestListOfFolders(), fold.SubFoldersCount); | 194 | remoteClient.SendInventoryFolderDetails( |
195 | libraryRoot.agentID, folderID, fold.RequestListOfItems(), | ||
196 | fold.RequestListOfFolders(), fetchFolders, fetchItems); | ||
192 | 197 | ||
193 | return; | 198 | return; |
194 | } | 199 | } |
@@ -203,15 +208,19 @@ namespace OpenSim.Framework.Communications.Cache | |||
203 | System.Console.Write("fetching root folder"); | 208 | System.Console.Write("fetching root folder"); |
204 | if (fetchItems) | 209 | if (fetchItems) |
205 | { | 210 | { |
206 | remoteClient.SendInventoryFolderDetails(remoteClient.AgentId, folderID, | 211 | remoteClient.SendInventoryFolderDetails( |
207 | userProfile.RootFolder.RequestListOfItems(), userProfile.RootFolder.RequestListOfFolders(), userProfile.RootFolder.SubFoldersCount); | 212 | remoteClient.AgentId, folderID, userProfile.RootFolder.RequestListOfItems(), |
213 | userProfile.RootFolder.RequestListOfFolders(), | ||
214 | fetchFolders, fetchItems); | ||
208 | } | 215 | } |
209 | } | 216 | } |
210 | else | 217 | else |
211 | { | 218 | { |
212 | if ((fold = userProfile.RootFolder.HasSubFolder(folderID)) != null) | 219 | if ((fold = userProfile.RootFolder.HasSubFolder(folderID)) != null) |
213 | { | 220 | { |
214 | remoteClient.SendInventoryFolderDetails(remoteClient.AgentId, folderID, fold.RequestListOfItems(), fold.RequestListOfFolders(), fold.SubFoldersCount); | 221 | remoteClient.SendInventoryFolderDetails( |
222 | remoteClient.AgentId, folderID, fold.RequestListOfItems(), | ||
223 | fold.RequestListOfFolders(), fetchFolders, fetchItems); | ||
215 | return; | 224 | return; |
216 | } | 225 | } |
217 | } | 226 | } |
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 41afe27..8ba161a 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -540,7 +540,9 @@ namespace OpenSim.Framework | |||
540 | void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, | 540 | void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, |
541 | LLQuaternion rotation, LLVector3 velocity, LLVector3 rotationalvelocity); | 541 | LLQuaternion rotation, LLVector3 velocity, LLVector3 rotationalvelocity); |
542 | 542 | ||
543 | void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, int subFoldersCount); | 543 | void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items, |
544 | List<InventoryFolderBase> folders, bool fetchFolders, | ||
545 | bool fetchItems); | ||
544 | void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item); | 546 | void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item); |
545 | 547 | ||
546 | /// <summary> | 548 | /// <summary> |