aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2016-11-11 16:04:20 +0000
committerUbitUmarov2016-11-11 16:04:20 +0000
commitc5d85b5465e6c2d6de2836b739324b634f57cc86 (patch)
tree0c401e5d6fec23b1735f060b3574a4b533413bcc
parentreduce useraccouts cache time (diff)
downloadopensim-SC_OLD-c5d85b5465e6c2d6de2836b739324b634f57cc86.zip
opensim-SC_OLD-c5d85b5465e6c2d6de2836b739324b634f57cc86.tar.gz
opensim-SC_OLD-c5d85b5465e6c2d6de2836b739324b634f57cc86.tar.bz2
opensim-SC_OLD-c5d85b5465e6c2d6de2836b739324b634f57cc86.tar.xz
reduce diferencs btw OpenSimDefaults.ini and OpenSim.ini.example
-rw-r--r--bin/OpenSim.ini.example10
-rw-r--r--bin/OpenSimDefaults.ini69
2 files changed, 54 insertions, 25 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 961c141..f6466b5 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -696,12 +696,6 @@
696 ;; then you might want to try setting this to false. 696 ;; then you might want to try setting this to false.
697 ; mesh_sculpted_prim = true 697 ; mesh_sculpted_prim = true
698 698
699 ;# {use_NINJA_physics_joints} {[Startup]physics:OpenDynamicsEngine} {Use jointed (NINJA) physics?} {true false} false
700 ;; If you would like physics joints to be enabled through a special naming
701 ;; convention in the client, set this to true.
702 ;; (see NINJA Physics, http://opensimulator.org/wiki/NINJA_Physics)
703 ; use_NINJA_physics_joints = false
704
705[RemoteAdmin] 699[RemoteAdmin]
706 ;; This is the remote admin module, which uses XMLRPC requests to 700 ;; This is the remote admin module, which uses XMLRPC requests to
707 ;; manage regions from a web interface. 701 ;; manage regions from a web interface.
@@ -1138,15 +1132,19 @@
1138 1132
1139 ;; several options to control NPCs creation 1133 ;; several options to control NPCs creation
1140 1134
1135 ;# {AllowNotOwned} {} {allow NPCs to be created not Owned} {true false} false
1141 ;; allow NPCs to be created not Owned {true false} default: true 1136 ;; allow NPCs to be created not Owned {true false} default: true
1142 ; AllowNotOwned = false 1137 ; AllowNotOwned = false
1143 1138
1139 ;# {AllowSenseAsAvatar} {} {allow NPCs to set to be sensed as Avatars} {true false} false
1144 ;; allow NPCs to set to be sensed as Avatars {true false} default: true 1140 ;; allow NPCs to set to be sensed as Avatars {true false} default: true
1145 ; AllowSenseAsAvatar = false 1141 ; AllowSenseAsAvatar = false
1146 1142
1143 ;# {AllowCloneOtherAvatars} {} {allow NPCs to created cloning any avatar in region} {true false} false
1147 ;; allow NPCs to created cloning any avatar in region {true false} default: true 1144 ;; allow NPCs to created cloning any avatar in region {true false} default: true
1148 ; AllowCloneOtherAvatars = false 1145 ; AllowCloneOtherAvatars = false
1149 1146
1147 ;# {NoNPCGroup} {} {if true NPCs will have no group title, if false display "- NPC -"} {true false} false
1150 ;; if true NPCs will have no group title, if false display "- NPC -" for easy identification {true false} default: true 1148 ;; if true NPCs will have no group title, if false display "- NPC -" for easy identification {true false} default: true
1151 ; NoNPCGroup = false 1149 ; NoNPCGroup = false
1152 1150
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6b04424..906c7bc 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -128,9 +128,16 @@
128 ; Increasing this number will increase memory usage. 128 ; Increasing this number will increase memory usage.
129 MaxPrimUndos = 20 129 MaxPrimUndos = 20
130 130
131 ; Minimum size for non-physical prims.This can be overridden in the region config file (as
132 ; NonPhysicalPrimMin!).
133 ; NonPhysicalPrimMin = 0.001
134
131 ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overridden in the region config file (as NonPhysicalPrimMax!). 135 ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overridden in the region config file (as NonPhysicalPrimMax!).
132 NonPhysicalPrimMax = 256 136 NonPhysicalPrimMax = 256
133 137
138 ; Minimum size where a prim can be physical. This can be overridden in the region config file.
139 ; PhysicalPrimMin = 0.01
140
134 ; Maximum size of physical prims. Affects resizing of existing prims. This can be overridden in the region config file. 141 ; Maximum size of physical prims. Affects resizing of existing prims. This can be overridden in the region config file.
135 PhysicalPrimMax = 64 142 PhysicalPrimMax = 64
136 143
@@ -304,6 +311,7 @@
304 ; ## SCRIPT ENGINE 311 ; ## SCRIPT ENGINE
305 ; ## 312 ; ##
306 313
314 ;; Default script engine to use. Currently, we only have XEngine
307 DefaultScriptEngine = "XEngine" 315 DefaultScriptEngine = "XEngine"
308 316
309 ; Http proxy setting for llHTTPRequest and dynamic texture loading, if 317 ; Http proxy setting for llHTTPRequest and dynamic texture loading, if
@@ -320,7 +328,8 @@
320 ; ## 328 ; ##
321 ; ## EMAIL MODULE 329 ; ## EMAIL MODULE
322 ; ## 330 ; ##
323 331 ;; The email module requires some configuration. It needs an SMTP
332 ;; server to send mail through.
324 ;emailmodule = DefaultEmailModule 333 ;emailmodule = DefaultEmailModule
325 334
326 ; ## 335 ; ##
@@ -395,15 +404,23 @@
395 404
396 405
397[Map] 406[Map]
407 ; Map tile options.
408 ; If true, then maptiles are generated using the MapImageModule below.
409 ; If false then the texture referenced by MaptileStaticUUID is used instead, which can also be overridden
410 ; in individual region config file(s). If you do not want to upload map tiles at all, then you will need
411 ; both to set this to false and comment out the [Modules] MapImageServiceModule setting in config-include/
412 ;GenerateMaptiles = true
413
398 ;WorldMapModule = "WorldMap" 414 ;WorldMapModule = "WorldMap"
415
416 ; The module to use in order to generate map images.
417 ; MapImageModule is the default. Warp3DImageModule is an alternative experimental module that can
418 ; generate better images.
399 ;MapImageModule = "MapImageModule" 419 ;MapImageModule = "MapImageModule"
400 420
401 ; World map blacklist timeout in seconds 421 ; World map blacklist timeout in seconds
402 ;BlacklistTimeout = 600 422 ;BlacklistTimeout = 600
403 423
404 ; Set to false to not generate any maptiles
405 ;GenerateMaptiles = true
406
407 ; Refresh (in seconds) the map tile periodically 424 ; Refresh (in seconds) the map tile periodically
408 ;MaptileRefresh = 0 425 ;MaptileRefresh = 0
409 426
@@ -431,6 +448,8 @@
431 ; ## PERMISSIONS 448 ; ## PERMISSIONS
432 ; ## 449 ; ##
433 450
451 ; Permission modules to use, separated by comma.
452 ; Possible modules are DefaultPermissionsModule, PrimLimitsModule
434 ;permissionmodules = "DefaultPermissionsModule" 453 ;permissionmodules = "DefaultPermissionsModule"
435 454
436 ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy 455 ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy
@@ -439,12 +458,22 @@
439 ; Default is true 458 ; Default is true
440 serverside_object_permissions = true 459 serverside_object_permissions = true
441 460
442 allow_grid_gods = false 461
443 462 ; This allows some control over permissions
444 ; This allows somne control over permissions
445 ; please note that this still doesn't duplicate SL, and is not intended to 463 ; please note that this still doesn't duplicate SL, and is not intended to
464
465 ; This allows grid users with a UserLevel of 200 or more to assume god
466 ; powers in the regions in this simulator.
467 allow_grid_gods = false
468
469 ; Allow region owners to assume god powers in their regions
446 ;region_owner_is_god = true 470 ;region_owner_is_god = true
471
472 ; Allow region managers to assume god powers in regions they manage
447 ;region_manager_is_god = false 473 ;region_manager_is_god = false
474
475 ; Allow parcel owners to assume god powers in their parcels
476 ; you really may not want this...
448 ;parcel_owner_is_god = false 477 ;parcel_owner_is_god = false
449 478
450 ; Control user types that are allowed to create new scripts 479 ; Control user types that are allowed to create new scripts
@@ -1108,16 +1137,6 @@
1108 mesh_physical_lod = 16 1137 mesh_physical_lod = 16
1109 1138
1110 ; ## 1139 ; ##
1111 ; ## Joint support
1112 ; ##
1113
1114 ; If you would like physics joints to be enabled through a special naming
1115 ; convention in the client, set this to true.
1116 ; (See NINJA Physics documentation, http://opensimulator.org/wiki/NINJA_Physics)
1117 ; Default is false
1118 ;use_NINJA_physics_joints = true
1119
1120 ; ##
1121 ; ## additional meshing options 1140 ; ## additional meshing options
1122 ; ## 1141 ; ##
1123 1142
@@ -1126,7 +1145,7 @@
1126 ; If you would rather have mesh proxies for simple prims, you can set this to 1145 ; If you would rather have mesh proxies for simple prims, you can set this to
1127 ; true. Note that this will increase memory usage and region startup time. 1146 ; true. Note that this will increase memory usage and region startup time.
1128 ; Default is false. 1147 ; Default is false.
1129 ;force_simple_prim_meshing = true 1148 ;force_simple_prim_meshing = false
1130 1149
1131 1150
1132[BulletSim] 1151[BulletSim]
@@ -2104,7 +2123,19 @@
2104[NPC] 2123[NPC]
2105 ;; Enable Non Player Character (NPC) facilities 2124 ;; Enable Non Player Character (NPC) facilities
2106 Enabled = false 2125 Enabled = false
2107 2126 ;; several options to control NPCs creation
2127
2128 ;; allow NPCs to be created not Owned {true false} default: true
2129 ; AllowNotOwned = false
2130
2131 ;; allow NPCs to set to be sensed as Avatars {true false} default: true
2132 ; AllowSenseAsAvatar = false
2133
2134 ;; allow NPCs to created cloning any avatar in region {true false} default: true
2135 ; AllowCloneOtherAvatars = false
2136
2137 ;; if true NPCs will have no group title, if false display "- NPC -" for easy identification {true false} default: true
2138 ; NoNPCGroup = false
2108 2139
2109[Terrain] 2140[Terrain]
2110 ; Values can be "pinhead-island" or "flat" 2141 ; Values can be "pinhead-island" or "flat"