diff options
Merge branch 'master' into diva-textures
Diffstat (limited to 'OpenSim/Framework/InventoryFolderBase.cs')
| -rw-r--r-- | OpenSim/Framework/InventoryFolderBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/InventoryFolderBase.cs b/OpenSim/Framework/InventoryFolderBase.cs index 3eef6f6..a12183c 100644 --- a/OpenSim/Framework/InventoryFolderBase.cs +++ b/OpenSim/Framework/InventoryFolderBase.cs | |||
| @@ -89,7 +89,7 @@ namespace OpenSim.Framework | |||
| 89 | ID = id; | 89 | ID = id; |
| 90 | Name = name; | 90 | Name = name; |
| 91 | Owner = owner; | 91 | Owner = owner; |
| 92 | ParentID = parent; | 92 | ParentID = parent; |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | public InventoryFolderBase(UUID id, string name, UUID owner, short type, UUID parent, ushort version) | 95 | public InventoryFolderBase(UUID id, string name, UUID owner, short type, UUID parent, ushort version) |