OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make default serverside_object_permissions = true since this better matches user expectations. 

It also matches the default setting in the OpenSim.ini.example file
bulletsim
Justin Clark-Casey (justincc) 2011-07-01 23:06:46 +01:00
parent e765759f50
commit fba961c63f
5 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@ -443,15 +443,6 @@ namespace OpenSim.Framework.Servers
{ {
string buildVersion = string.Empty; 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 // The subversion information is deprecated and will be removed at a later date
// Add subversion revision information if available // Add subversion revision information if available
// Try file "svn_revision" in the current directory first, then the .svn info. // Try file "svn_revision" in the current directory first, then the .svn info.
@ -507,7 +498,6 @@ namespace OpenSim.Framework.Servers
} }
else else
{ {
m_log.DebugFormat("[OPENSIM]: Looking for SVN");
// Remove the else logic when subversion mirror is no longer used // Remove the else logic when subversion mirror is no longer used
if (File.Exists(svnRevisionFileName)) if (File.Exists(svnRevisionFileName))
{ {
@ -515,7 +505,6 @@ namespace OpenSim.Framework.Servers
buildVersion = RevisionFile.ReadLine(); buildVersion = RevisionFile.ReadLine();
buildVersion.Trim(); buildVersion.Trim();
RevisionFile.Close(); RevisionFile.Close();
} }
if (string.IsNullOrEmpty(buildVersion) && File.Exists(svnFileName)) if (string.IsNullOrEmpty(buildVersion) && File.Exists(svnFileName))

2
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@ -328,7 +328,7 @@ namespace OpenSim
config.Set("meshing", "Meshmerizer"); config.Set("meshing", "Meshmerizer");
config.Set("physical_prim", true); config.Set("physical_prim", true);
config.Set("see_into_this_sim_from_neighbor", 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_plugin", "OpenSim.Data.SQLite.dll");
config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
config.Set("storage_prim_inventories", true); config.Set("storage_prim_inventories", true);

2
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return; return;
m_allowGridGods = myConfig.GetBoolean("allow_grid_gods", false); 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_propagatePermissions = myConfig.GetBoolean("propagate_permissions", true);
m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true); m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true);
m_RegionManagerIsGod = myConfig.GetBoolean("region_manager_is_god", false); m_RegionManagerIsGod = myConfig.GetBoolean("region_manager_is_god", false);

2
OpenSim/Tools/Configger/ConfigurationLoader.cs
View File

@ -239,7 +239,7 @@ namespace OpenSim.Tools.Configger
config.Set("meshing", "Meshmerizer"); config.Set("meshing", "Meshmerizer");
config.Set("physical_prim", true); config.Set("physical_prim", true);
config.Set("see_into_this_sim_from_neighbor", 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_plugin", "OpenSim.Data.SQLite.dll");
config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
config.Set("storage_prim_inventories", true); config.Set("storage_prim_inventories", true);

2
bin/OpenSim.ini.example
View File

@ -172,7 +172,7 @@
;; permission checks (allowing anybody to copy ;; permission checks (allowing anybody to copy
;; any item, etc. This may not yet be implemented uniformally. ;; any item, etc. This may not yet be implemented uniformally.
;; If set to true, then all permissions checks are carried out ;; 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 ;; This allows users with a UserLevel of 200 or more to assume god
;; powers in the regions in this simulator. ;; powers in the regions in this simulator.