diff options
author | Oren Hurvitz | 2014-05-04 13:36:36 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-05-06 07:16:37 +0100 |
commit | 0fe08c8799b1a3a2d5a07c206c2f9680d1c0798e (patch) | |
tree | 680f0d84eb83f1e4924d8b26ebed7bec5755d029 /OpenSim/Region/ClientStack | |
parent | Added range-checking for the parameters to PRIM_POINT_LIGHT (used in llSetLin... (diff) | |
download | opensim-SC_OLD-0fe08c8799b1a3a2d5a07c206c2f9680d1c0798e.zip opensim-SC_OLD-0fe08c8799b1a3a2d5a07c206c2f9680d1c0798e.tar.gz opensim-SC_OLD-0fe08c8799b1a3a2d5a07c206c2f9680d1c0798e.tar.bz2 opensim-SC_OLD-0fe08c8799b1a3a2d5a07c206c2f9680d1c0798e.tar.xz |
- When sending the "My Suitcase" folder to the client, always claim it has Folder Type 8. (Previously we had used Folder Type -1 in one place, and LLClientView didn't even bother changing Folder Type 100 to anything else.)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 7cb5b53..53217a0 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -1761,6 +1761,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1761 | newBlock.Name = Util.StringToBytes256(folder.Name); | 1761 | newBlock.Name = Util.StringToBytes256(folder.Name); |
1762 | newBlock.ParentID = folder.ParentID; | 1762 | newBlock.ParentID = folder.ParentID; |
1763 | newBlock.Type = (sbyte)folder.Type; | 1763 | newBlock.Type = (sbyte)folder.Type; |
1764 | if (newBlock.Type == InventoryItemBase.SUITCASE_FOLDER_TYPE) | ||
1765 | newBlock.Type = InventoryItemBase.SUITCASE_FOLDER_FAKE_TYPE; | ||
1764 | 1766 | ||
1765 | return newBlock; | 1767 | return newBlock; |
1766 | } | 1768 | } |
@@ -2010,8 +2012,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2010 | 2012 | ||
2011 | folderBlock.FolderID = folder.ID; | 2013 | folderBlock.FolderID = folder.ID; |
2012 | folderBlock.ParentID = folder.ParentID; | 2014 | folderBlock.ParentID = folder.ParentID; |
2013 | //folderBlock.Type = -1; | ||
2014 | folderBlock.Type = (sbyte)folder.Type; | 2015 | folderBlock.Type = (sbyte)folder.Type; |
2016 | if (folderBlock.Type == InventoryItemBase.SUITCASE_FOLDER_TYPE) | ||
2017 | folderBlock.Type = InventoryItemBase.SUITCASE_FOLDER_FAKE_TYPE; | ||
2015 | folderBlock.Name = Util.StringToBytes256(folder.Name); | 2018 | folderBlock.Name = Util.StringToBytes256(folder.Name); |
2016 | 2019 | ||
2017 | return folderBlock; | 2020 | return folderBlock; |