aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
diff options
context:
space:
mode:
authorCasperW2009-12-23 14:15:27 +0100
committerCasperW2009-12-23 14:15:27 +0100
commitc54e0953d09f74be65f7f1939af16afcb8ade054 (patch)
tree30fdda415425190bb50a752d7b84f64e0a29db9b /OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
parentAdded some null reference and deleted group checks to certain functions to fi... (diff)
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC_OLD-c54e0953d09f74be65f7f1939af16afcb8ade054.zip
opensim-SC_OLD-c54e0953d09f74be65f7f1939af16afcb8ade054.tar.gz
opensim-SC_OLD-c54e0953d09f74be65f7f1939af16afcb8ade054.tar.bz2
opensim-SC_OLD-c54e0953d09f74be65f7f1939af16afcb8ade054.tar.xz
Merge branch 'master' of ssh://TOR/var/git/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 {