aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
diff options
context:
space:
mode:
authorMelanie2009-12-21 15:02:57 +0000
committerMelanie2009-12-21 15:02:57 +0000
commitb89129113510ddbbf23aa022a9493a3a28735a6b (patch)
treed8d275cdcf6943725e588c0b29f16c0037fb82f8 /OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
parentMerge branch 'master' into casper (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-b89129113510ddbbf23aa022a9493a3a28735a6b.zip
opensim-SC-b89129113510ddbbf23aa022a9493a3a28735a6b.tar.gz
opensim-SC-b89129113510ddbbf23aa022a9493a3a28735a6b.tar.bz2
opensim-SC-b89129113510ddbbf23aa022a9493a3a28735a6b.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs')
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 7305795..42e6510 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -171,6 +171,7 @@ namespace OpenSim.Framework.Communications.Cache
171 item.NextPermissions = (uint)config.GetLong("nextPermissions", 0x7FFFFFFF); 171 item.NextPermissions = (uint)config.GetLong("nextPermissions", 0x7FFFFFFF);
172 item.EveryOnePermissions = (uint)config.GetLong("everyonePermissions", 0x7FFFFFFF); 172 item.EveryOnePermissions = (uint)config.GetLong("everyonePermissions", 0x7FFFFFFF);
173 item.BasePermissions = (uint)config.GetLong("basePermissions", 0x7FFFFFFF); 173 item.BasePermissions = (uint)config.GetLong("basePermissions", 0x7FFFFFFF);
174 item.Flags = (uint)config.GetInt("flags", 0);
174 175
175 if (libraryFolders.ContainsKey(item.Folder)) 176 if (libraryFolders.ContainsKey(item.Folder))
176 { 177 {