diff options
| author | Melanie | 2009-12-21 14:47:40 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-21 14:47:40 +0000 |
| commit | 1e55d74c5c01e76104ac5535ec3c228a6c591d45 (patch) | |
| tree | 7d447a02e44767546121388ea0f21afad8938622 /OpenSim/Framework | |
| parent | Patch from Ziah. (diff) | |
| parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-1e55d74c5c01e76104ac5535ec3c228a6c591d45.zip opensim-SC-1e55d74c5c01e76104ac5535ec3c228a6c591d45.tar.gz opensim-SC-1e55d74c5c01e76104ac5535ec3c228a6c591d45.tar.bz2 opensim-SC-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.cs | 1 |
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 | { |