diff options
author | Justin Clark-Casey (justincc) | 2011-07-01 23:06:46 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-01 23:06:46 +0100 |
commit | fba961c63f2168eb560eec84b66203b1a875b952 (patch) | |
tree | 3c8dc9999ab5b53cffa0e4f050c9376afbc0f81d | |
parent | If OpenSim has been built from a git tree, then include version information a... (diff) | |
download | opensim-SC_OLD-fba961c63f2168eb560eec84b66203b1a875b952.zip opensim-SC_OLD-fba961c63f2168eb560eec84b66203b1a875b952.tar.gz opensim-SC_OLD-fba961c63f2168eb560eec84b66203b1a875b952.tar.bz2 opensim-SC_OLD-fba961c63f2168eb560eec84b66203b1a875b952.tar.xz |
Make default serverside_object_permissions = true since this better matches user expectations.
It also matches the default setting in the OpenSim.ini.example file
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tools/Configger/ConfigurationLoader.cs | 2 | ||||
-rw-r--r-- | 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 | |||
443 | { | 443 | { |
444 | string buildVersion = string.Empty; | 444 | string buildVersion = string.Empty; |
445 | 445 | ||
446 | // Add commit hash and date information if available | ||
447 | // The commit hash and date are stored in a file bin/.version | ||
448 | // This file can automatically created by a post | ||
449 | // commit script in the opensim git master repository or | ||
450 | // by issuing the follwoing command from the top level | ||
451 | // directory of the opensim repository | ||
452 | // git log -n 1 --pretty="format:%h: %ci" >bin/.version | ||
453 | // For the full git commit hash use %H instead of %h | ||
454 | // | ||
455 | // The subversion information is deprecated and will be removed at a later date | 446 | // The subversion information is deprecated and will be removed at a later date |
456 | // Add subversion revision information if available | 447 | // Add subversion revision information if available |
457 | // Try file "svn_revision" in the current directory first, then the .svn info. | 448 | // Try file "svn_revision" in the current directory first, then the .svn info. |
@@ -507,7 +498,6 @@ namespace OpenSim.Framework.Servers | |||
507 | } | 498 | } |
508 | else | 499 | else |
509 | { | 500 | { |
510 | m_log.DebugFormat("[OPENSIM]: Looking for SVN"); | ||
511 | // Remove the else logic when subversion mirror is no longer used | 501 | // Remove the else logic when subversion mirror is no longer used |
512 | if (File.Exists(svnRevisionFileName)) | 502 | if (File.Exists(svnRevisionFileName)) |
513 | { | 503 | { |
@@ -515,7 +505,6 @@ namespace OpenSim.Framework.Servers | |||
515 | buildVersion = RevisionFile.ReadLine(); | 505 | buildVersion = RevisionFile.ReadLine(); |
516 | buildVersion.Trim(); | 506 | buildVersion.Trim(); |
517 | RevisionFile.Close(); | 507 | RevisionFile.Close(); |
518 | |||
519 | } | 508 | } |
520 | 509 | ||
521 | if (string.IsNullOrEmpty(buildVersion) && File.Exists(svnFileName)) | 510 | 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 | |||
328 | config.Set("meshing", "Meshmerizer"); | 328 | config.Set("meshing", "Meshmerizer"); |
329 | config.Set("physical_prim", true); | 329 | config.Set("physical_prim", true); |
330 | config.Set("see_into_this_sim_from_neighbor", true); | 330 | config.Set("see_into_this_sim_from_neighbor", true); |
331 | config.Set("serverside_object_permissions", false); | 331 | config.Set("serverside_object_permissions", true); |
332 | config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); | 332 | config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); |
333 | config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); | 333 | config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); |
334 | config.Set("storage_prim_inventories", true); | 334 | 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 | |||
134 | return; | 134 | return; |
135 | 135 | ||
136 | m_allowGridGods = myConfig.GetBoolean("allow_grid_gods", false); | 136 | m_allowGridGods = myConfig.GetBoolean("allow_grid_gods", false); |
137 | m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", false); | 137 | m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true); |
138 | m_propagatePermissions = myConfig.GetBoolean("propagate_permissions", true); | 138 | m_propagatePermissions = myConfig.GetBoolean("propagate_permissions", true); |
139 | m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true); | 139 | m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true); |
140 | m_RegionManagerIsGod = myConfig.GetBoolean("region_manager_is_god", false); | 140 | 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 | |||
239 | config.Set("meshing", "Meshmerizer"); | 239 | config.Set("meshing", "Meshmerizer"); |
240 | config.Set("physical_prim", true); | 240 | config.Set("physical_prim", true); |
241 | config.Set("see_into_this_sim_from_neighbor", true); | 241 | config.Set("see_into_this_sim_from_neighbor", true); |
242 | config.Set("serverside_object_permissions", false); | 242 | config.Set("serverside_object_permissions", true); |
243 | config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); | 243 | config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); |
244 | config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); | 244 | config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); |
245 | config.Set("storage_prim_inventories", true); | 245 | 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 @@ | |||
172 | ;; permission checks (allowing anybody to copy | 172 | ;; permission checks (allowing anybody to copy |
173 | ;; any item, etc. This may not yet be implemented uniformally. | 173 | ;; any item, etc. This may not yet be implemented uniformally. |
174 | ;; If set to true, then all permissions checks are carried out | 174 | ;; If set to true, then all permissions checks are carried out |
175 | ; serverside_object_permissions = false | 175 | ; serverside_object_permissions = true |
176 | 176 | ||
177 | ;; This allows users with a UserLevel of 200 or more to assume god | 177 | ;; This allows users with a UserLevel of 200 or more to assume god |
178 | ;; powers in the regions in this simulator. | 178 | ;; powers in the regions in this simulator. |