aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2012-04-06 11:24:34 -0700
committerDiva Canto2012-04-06 11:24:34 -0700
commit8fd86c91561ade716a9179653e9ffb75ff1df438 (patch)
tree5c80d05e16d15149295a5297fb7bbe21db51ab78 /OpenSim
parentGuard against null inventory contents. (diff)
downloadopensim-SC_OLD-8fd86c91561ade716a9179653e9ffb75ff1df438.zip
opensim-SC_OLD-8fd86c91561ade716a9179653e9ffb75ff1df438.tar.gz
opensim-SC_OLD-8fd86c91561ade716a9179653e9ffb75ff1df438.tar.bz2
opensim-SC_OLD-8fd86c91561ade716a9179653e9ffb75ff1df438.tar.xz
Packing of folder in SendBulkUpdateInventory always set the folder type to -1. Not sure if there's a reason for it, but I'm changing it to the given folder type.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 3470fa9..9395233 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1913,7 +1913,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1913 1913
1914 folderBlock.FolderID = folder.ID; 1914 folderBlock.FolderID = folder.ID;
1915 folderBlock.ParentID = folder.ParentID; 1915 folderBlock.ParentID = folder.ParentID;
1916 folderBlock.Type = -1; 1916 //folderBlock.Type = -1;
1917 folderBlock.Type = (sbyte)folder.Type;
1917 folderBlock.Name = Util.StringToBytes256(folder.Name); 1918 folderBlock.Name = Util.StringToBytes256(folder.Name);
1918 1919
1919 return folderBlock; 1920 return folderBlock;