From fba961c63f2168eb560eec84b66203b1a875b952 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 1 Jul 2011 23:06:46 +0100
Subject: Make default serverside_object_permissions = true since this better
matches user expectations.
It also matches the default setting in the OpenSim.ini.example file
---
OpenSim/Framework/Servers/BaseOpenSimServer.cs | 11 -----------
OpenSim/Region/Application/ConfigurationLoader.cs | 2 +-
.../Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 +-
OpenSim/Tools/Configger/ConfigurationLoader.cs | 2 +-
bin/OpenSim.ini.example | 2 +-
5 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index d4c3d08..688be3f 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -443,15 +443,6 @@ namespace OpenSim.Framework.Servers
{
string buildVersion = string.Empty;
- // Add commit hash and date information if available
- // The commit hash and date are stored in a file bin/.version
- // This file can automatically created by a post
- // commit script in the opensim git master repository or
- // by issuing the follwoing command from the top level
- // directory of the opensim repository
- // git log -n 1 --pretty="format:%h: %ci" >bin/.version
- // For the full git commit hash use %H instead of %h
- //
// The subversion information is deprecated and will be removed at a later date
// Add subversion revision information if available
// Try file "svn_revision" in the current directory first, then the .svn info.
@@ -507,7 +498,6 @@ namespace OpenSim.Framework.Servers
}
else
{
- m_log.DebugFormat("[OPENSIM]: Looking for SVN");
// Remove the else logic when subversion mirror is no longer used
if (File.Exists(svnRevisionFileName))
{
@@ -515,7 +505,6 @@ namespace OpenSim.Framework.Servers
buildVersion = RevisionFile.ReadLine();
buildVersion.Trim();
RevisionFile.Close();
-
}
if (string.IsNullOrEmpty(buildVersion) && File.Exists(svnFileName))
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 2d81ea8..d19852b 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -328,7 +328,7 @@ namespace OpenSim
config.Set("meshing", "Meshmerizer");
config.Set("physical_prim", true);
config.Set("see_into_this_sim_from_neighbor", true);
- config.Set("serverside_object_permissions", false);
+ config.Set("serverside_object_permissions", true);
config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
config.Set("storage_prim_inventories", true);
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index d7324c6..a40517c 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return;
m_allowGridGods = myConfig.GetBoolean("allow_grid_gods", false);
- m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", false);
+ m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true);
m_propagatePermissions = myConfig.GetBoolean("propagate_permissions", true);
m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true);
m_RegionManagerIsGod = myConfig.GetBoolean("region_manager_is_god", false);
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs
index 8e71b42..3914652 100644
--- a/OpenSim/Tools/Configger/ConfigurationLoader.cs
+++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs
@@ -239,7 +239,7 @@ namespace OpenSim.Tools.Configger
config.Set("meshing", "Meshmerizer");
config.Set("physical_prim", true);
config.Set("see_into_this_sim_from_neighbor", true);
- config.Set("serverside_object_permissions", false);
+ config.Set("serverside_object_permissions", true);
config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
config.Set("storage_prim_inventories", true);
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index a4f243d..60d37fb 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -172,7 +172,7 @@
;; permission checks (allowing anybody to copy
;; any item, etc. This may not yet be implemented uniformally.
;; If set to true, then all permissions checks are carried out
- ; serverside_object_permissions = false
+ ; serverside_object_permissions = true
;; This allows users with a UserLevel of 200 or more to assume god
;; powers in the regions in this simulator.
--
cgit v1.1