aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2009-12-21 14:47:40 +0000
committerMelanie2009-12-21 14:47:40 +0000
commit1e55d74c5c01e76104ac5535ec3c228a6c591d45 (patch)
tree7d447a02e44767546121388ea0f21afad8938622 /OpenSim/Framework
parentPatch from Ziah. (diff)
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-1e55d74c5c01e76104ac5535ec3c228a6c591d45.zip
opensim-SC_OLD-1e55d74c5c01e76104ac5535ec3c228a6c591d45.tar.gz
opensim-SC_OLD-1e55d74c5c01e76104ac5535ec3c228a6c591d45.tar.bz2
opensim-SC_OLD-1e55d74c5c01e76104ac5535ec3c228a6c591d45.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
-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 {