diff options
| author | Melanie | 2012-06-21 01:10:13 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-21 01:10:13 +0100 |
| commit | eab211f94d33f9c77a63344072a79cb66707c0ff (patch) | |
| tree | 4ec906bf15a6738a1a2443ccc23f83c85ef3fa0b /OpenSim/Region/CoreModules/World/Permissions | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Use HasPrivateAttachmentPoint properties in SOG.DeleteGroupFromScene() instea... (diff) | |
| download | opensim-SC-eab211f94d33f9c77a63344072a79cb66707c0ff.zip opensim-SC-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.gz opensim-SC-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.bz2 opensim-SC-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 9a542a3..f3d38bc 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -348,12 +348,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 348 | m_friendsModule = m_scene.RequestModuleInterface<IFriendsModule>(); | 348 | m_friendsModule = m_scene.RequestModuleInterface<IFriendsModule>(); |
| 349 | 349 | ||
| 350 | if (m_friendsModule == null) | 350 | if (m_friendsModule == null) |
| 351 | m_log.Warn("[PERMISSIONS]: Friends module not found, friend permissions will not work"); | 351 | m_log.Debug("[PERMISSIONS]: Friends module not found, friend permissions will not work"); |
| 352 | 352 | ||
| 353 | m_groupsModule = m_scene.RequestModuleInterface<IGroupsModule>(); | 353 | m_groupsModule = m_scene.RequestModuleInterface<IGroupsModule>(); |
| 354 | 354 | ||
| 355 | if (m_groupsModule == null) | 355 | if (m_groupsModule == null) |
| 356 | m_log.Warn("[PERMISSIONS]: Groups module not found, group permissions will not work"); | 356 | m_log.Debug("[PERMISSIONS]: Groups module not found, group permissions will not work"); |
| 357 | 357 | ||
| 358 | m_moapModule = m_scene.RequestModuleInterface<IMoapModule>(); | 358 | m_moapModule = m_scene.RequestModuleInterface<IMoapModule>(); |
| 359 | 359 | ||