diff options
| author | Makopoppo | 2011-07-17 11:22:29 +0900 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-07-23 02:26:13 +0100 |
| commit | 4eaca4884eca26ca4cb73a6ce4c7edee38b789ac (patch) | |
| tree | 32eab67ac360dc95acf3eb0a54c1d35893037f53 | |
| parent | For default everyone permissions on library items, make notecards and scripts... (diff) | |
| download | opensim-SC_OLD-4eaca4884eca26ca4cb73a6ce4c7edee38b789ac.zip opensim-SC_OLD-4eaca4884eca26ca4cb73a6ce4c7edee38b789ac.tar.gz opensim-SC_OLD-4eaca4884eca26ca4cb73a6ce4c7edee38b789ac.tar.bz2 opensim-SC_OLD-4eaca4884eca26ca4cb73a6ce4c7edee38b789ac.tar.xz | |
Fixed serverside_object_permission default value confliction
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 | ||||
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index a40517c..7cb3751 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 146 | = ParseUserSetConfigSetting(myConfig, "allowed_script_editors", m_allowedScriptEditors); | 146 | = ParseUserSetConfigSetting(myConfig, "allowed_script_editors", m_allowedScriptEditors); |
| 147 | 147 | ||
| 148 | if (m_bypassPermissions) | 148 | if (m_bypassPermissions) |
| 149 | m_log.Info("[PERMISSIONS]: serviceside_object_permissions = false in ini file so disabling all region service permission checks"); | 149 | m_log.Info("[PERMISSIONS]: serverside_object_permissions = false in ini file so disabling all region service permission checks"); |
| 150 | else | 150 | else |
| 151 | m_log.Debug("[PERMISSIONS]: Enabling all region service permission checks"); | 151 | m_log.Debug("[PERMISSIONS]: Enabling all region service permission checks"); |
| 152 | 152 | ||
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index bf36228..a7e40db 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -169,8 +169,8 @@ | |||
| 169 | ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy | 169 | ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy |
| 170 | ; any item, etc. This may not yet be implemented uniformally. | 170 | ; any item, etc. This may not yet be implemented uniformally. |
| 171 | ; If set to true, then all permissions checks are carried out | 171 | ; If set to true, then all permissions checks are carried out |
| 172 | ; Default is false | 172 | ; Default is true |
| 173 | serverside_object_permissions = false | 173 | serverside_object_permissions = true |
| 174 | 174 | ||
| 175 | allow_grid_gods = false | 175 | allow_grid_gods = false |
| 176 | 176 | ||