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 /OpenSim/Framework | |
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
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 11 |
1 files changed, 0 insertions, 11 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)) |