diff options
| author | Justin Clark-Casey (justincc) | 2012-04-06 20:29:54 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-04-06 20:29:54 +0100 |
| commit | 908cebbea8d7e685223b22ef8216971daccbdd53 (patch) | |
| tree | 9827cf434e8013a4618bb278857d68373054f882 /OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |
| parent | remove possible PhysActor unexpectedly null race conditions when changing pri... (diff) | |
| parent | Deleted the unused and commented code from 2 commits ago. (diff) | |
| download | opensim-SC_OLD-908cebbea8d7e685223b22ef8216971daccbdd53.zip opensim-SC_OLD-908cebbea8d7e685223b22ef8216971daccbdd53.tar.gz opensim-SC_OLD-908cebbea8d7e685223b22ef8216971daccbdd53.tar.bz2 opensim-SC_OLD-908cebbea8d7e685223b22ef8216971daccbdd53.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 3 |
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; |