aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example61
-rw-r--r--bin/OpenSimDefaults.ini38
-rw-r--r--bin/addon-modules/README1
-rw-r--r--bin/config-include/FlotsamCache.ini.example5
-rw-r--r--bin/config-include/StandaloneCommon.ini.example3
5 files changed, 62 insertions, 46 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index bab118f..60d37fb 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -78,20 +78,19 @@
78 ; DrawPrimOnMapTile = true 78 ; DrawPrimOnMapTile = true
79 79
80 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256 80 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256
81 ;; Maximum size for non-physical prims 81 ;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!).
82 ; NonPhysicalPrimMax = 256 82 ; NonPhysicalPrimMax = 256
83 83
84 ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10 84 ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10
85 ;; Maximum size where a prim can be physical 85 ;; Maximum size where a prim can be physical. Affects resizing of existing prims. This can be overriden in the region config file.
86 ; PhysicalPrimMax = 10 86 ; PhysicalPrimMax = 10
87 87
88 ;; Prevent the creation, import and rez of prims that exceed the 88 ;; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum
89 ;; maximum size. 89 ;; This can be overriden in the region config file.
90 ; ClampPrimSize = false 90 ; ClampPrimSize = false
91 91
92 ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} false 92 ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} false
93 ;; Allow scripts to cross region boundaries. These are recompiled on the 93 ;; Allow scripts to keep running when they cross region boundaries, rather than being restarted. Script code is recompiled on the destination region and the state reloaded.
94 ;; new region.
95 ; AllowScriptCrossing = false 94 ; AllowScriptCrossing = false
96 95
97 ;# {TrustBinaries} {AllowScriptCrossing:true} {Accept compiled binary script code? (DANGEROUS!)} {true false} false 96 ;# {TrustBinaries} {AllowScriptCrossing:true} {Accept compiled binary script code? (DANGEROUS!)} {true false} false
@@ -173,7 +172,7 @@
173 ;; permission checks (allowing anybody to copy 172 ;; permission checks (allowing anybody to copy
174 ;; any item, etc. This may not yet be implemented uniformally. 173 ;; any item, etc. This may not yet be implemented uniformally.
175 ;; If set to true, then all permissions checks are carried out 174 ;; If set to true, then all permissions checks are carried out
176 ; serverside_object_permissions = false 175 ; serverside_object_permissions = true
177 176
178 ;; 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
179 ;; powers in the regions in this simulator. 178 ;; powers in the regions in this simulator.
@@ -292,28 +291,31 @@
292 ;; building's lights to possibly not be rendered. 291 ;; building's lights to possibly not be rendered.
293 ; DisableFacelights = "false" 292 ; DisableFacelights = "false"
294 293
294
295[ClientStack.LindenCaps] 295[ClientStack.LindenCaps]
296 ;; For the long list of capabilities, see OpenSimDefaults.ini 296 ;; For the long list of capabilities, see OpenSimDefaults.ini
297 ;; Here are the few ones you may want to change. Possible values 297 ;; Here are the few ones you may want to change. Possible values
298 ;; are: 298 ;; are:
299 ;; "" -- empty, capability disabled 299 ;; "" -- empty, capability disabled
300 ;; "localhost" -- capability enabled and served by the simulator 300 ;; "localhost" -- capability enabled and served by the simulator
301 ;; "<url>" -- capability enabled and served by some other server 301 ;; "<url>" -- capability enabled and served by some other server
302 ;; 302 ;;
303 ; These are enabled by default to localhost. Change if you see fit. 303 ; These are enabled by default to localhost. Change if you see fit.
304 Cap_GetTexture = "localhost" 304 Cap_GetTexture = "localhost"
305 Cap_GetMesh = "localhost" 305 Cap_GetMesh = "localhost"
306 ; This is disabled by default. Change if you see fit. Note that 306 ; This is disabled by default. Change if you see fit. Note that
307 ; serving this cap from the simulators may lead to poor performace. 307 ; serving this cap from the simulators may lead to poor performace.
308 Cap_WebFetchInventoryDescendents = "" 308 Cap_WebFetchInventoryDescendents = ""
309
309 310
310[SimulatorFeatures] 311[SimulatorFeatures]
311 ; Experimental new information sent in SimulatorFeatures cap for Kokua viewers 312 ; Experimental new information sent in SimulatorFeatures cap for Kokua viewers
312 ; meant to override the MapImage and search server url given at login, and varying 313 ; meant to override the MapImage and search server url given at login, and varying
313 ; on a sim-basis. 314 ; on a sim-basis.
314 ; Viewers that don't understand it, will ignore it 315 ; Viewers that don't understand it, will ignore it
315 ;MapImageServerURI = "http://127.0.0.1:9000/ 316 ;MapImageServerURI = "http://127.0.0.1:9000/
316 ;SearchServerURI = "http://127.0.0.1:9000/ 317 ;SearchServerURI = "http://127.0.0.1:9000/
318
317 319
318[Chat] 320[Chat]
319 ;# {whisper_distance} {} {Distance at which a whisper is heard, in meters?} {} 10 321 ;# {whisper_distance} {} {Distance at which a whisper is heard, in meters?} {} 10
@@ -443,8 +445,8 @@
443 ;; to ConfigurableWind and uncomment the following. 445 ;; to ConfigurableWind and uncomment the following.
444 ; avg_strength = 5.0 446 ; avg_strength = 5.0
445 ; avg_direction = 0.0 447 ; avg_direction = 0.0
446 ; var_strength = 0.0 448 ; var_strength = 5.0
447 ; var_direction = 0.0 449 ; var_direction = 30.0
448 ; rate_change = 1.0 450 ; rate_change = 1.0
449 451
450 ;# {strength} {enabled:true wind_plugin:SimpleRandomWind} {Wind strength?} {} 1.0 452 ;# {strength} {enabled:true wind_plugin:SimpleRandomWind} {Wind strength?} {} 1.0
@@ -650,6 +652,7 @@
650 ;; If using a remote connector, specify the server URL 652 ;; If using a remote connector, specify the server URL
651 ; FreeswitchServiceURL = http://my.grid.server:8004/fsapi 653 ; FreeswitchServiceURL = http://my.grid.server:8004/fsapi
652 654
655
653[Groups] 656[Groups]
654 ;# {Enabled} {} {Enable groups?} {true false} false 657 ;# {Enabled} {} {Enable groups?} {true false} false
655 ;; Enables the groups module 658 ;; Enables the groups module
@@ -707,11 +710,13 @@
707 ;; Enable media on a prim facilities 710 ;; Enable media on a prim facilities
708 ; Enabled = true; 711 ; Enabled = true;
709 712
713
710[PrimLimitsModule] 714[PrimLimitsModule]
711 ;# {EnforcePrimLimits} {} {Enforce parcel prim limits} {true false} false 715 ;# {EnforcePrimLimits} {} {Enforce parcel prim limits} {true false} false
712 ;; Enable parcel prim limits. Off by default to emulate pre-existing behavior. 716 ;; Enable parcel prim limits. Off by default to emulate pre-existing behavior.
713 ; EnforcePrimLimits = false 717 ; EnforcePrimLimits = false
714 718
719
715[Architecture] 720[Architecture]
716 ;# {Include-Architecture} {} {Choose one of the following architectures} {config-include/Standalone.ini config-include/StandaloneHypergrid.ini config-include/Grid.ini config-include/GridHypergrid.ini config-include/SimianGrid.ini config-include/HyperSimianGrid.ini} config-include/Standalone.ini 721 ;# {Include-Architecture} {} {Choose one of the following architectures} {config-include/Standalone.ini config-include/StandaloneHypergrid.ini config-include/Grid.ini config-include/GridHypergrid.ini config-include/SimianGrid.ini config-include/HyperSimianGrid.ini} config-include/Standalone.ini
717 ;; Uncomment one of the following includes as required. For instance, to create a standalone OpenSim, 722 ;; Uncomment one of the following includes as required. For instance, to create a standalone OpenSim,
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index fa5392d..400d3df 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -14,10 +14,13 @@
14 ; Place to create a PID file 14 ; Place to create a PID file
15 ; PIDFile = "/tmp/my.pid" 15 ; PIDFile = "/tmp/my.pid"
16 16
17 ; Console commands run at startup
17 startup_console_commands_file = "startup_commands.txt" 18 startup_console_commands_file = "startup_commands.txt"
19
20 ; Console commands run on shutdown
18 shutdown_console_commands_file = "shutdown_commands.txt" 21 shutdown_console_commands_file = "shutdown_commands.txt"
19 22
20 ; To run a script every few minutes, set the script filename here 23 ; Console commands run every 20 minutes
21 ; timer_Script = "filename" 24 ; timer_Script = "filename"
22 25
23 ; ## 26 ; ##
@@ -70,12 +73,17 @@
70 ; Use terrain texture for maptiles if true, use shaded green if false 73 ; Use terrain texture for maptiles if true, use shaded green if false
71 TextureOnMapTile = false 74 TextureOnMapTile = false
72 75
73 ; Maximum total size, and maximum size where a prim can be physical 76 ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!).
74 NonPhysicalPrimMax = 256 77 NonPhysicalPrimMax = 256
75 PhysicalPrimMax = 10 ; (I think this was moved to the Regions.ini!) 78
79 ; Maximum size of physical prims. Affects resizing of existing prims. This can be overriden in the region config file.
80 PhysicalPrimMax = 10
81
82 ; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum
83 ; This can be overriden in the region config file.
76 ClampPrimSize = false 84 ClampPrimSize = false
77 85
78 ; Allow scripts to cross region boundaries. These are recompiled on the new region. 86 ; Allow scripts to keep running when they cross region boundaries, rather than being restarted. Script code is recompiled on the destination region and the state reloaded.
79 AllowScriptCrossing = false 87 AllowScriptCrossing = false
80 88
81 ; Allow compiled script binary code to cross region boundaries. 89 ; Allow compiled script binary code to cross region boundaries.
@@ -94,7 +102,7 @@
94 ; neighbors on each side for a total of 49 regions in view. Warning, unless 102 ; neighbors on each side for a total of 49 regions in view. Warning, unless
95 ; all the regions have the same drawdistance, you will end up with strange 103 ; all the regions have the same drawdistance, you will end up with strange
96 ; effects because the agents that get closed may be inconsistent. 104 ; effects because the agents that get closed may be inconsistent.
97 ; DefaultDrawDistance = 255.0 105 DefaultDrawDistance = 255.0
98 106
99 ; If you have only one region in an instance, or to avoid the many bugs 107 ; If you have only one region in an instance, or to avoid the many bugs
100 ; that you can trigger in modules by restarting a region, set this to 108 ; that you can trigger in modules by restarting a region, set this to
@@ -102,7 +110,7 @@
102 ; This is meant to be used on systems where some external system like 110 ; This is meant to be used on systems where some external system like
103 ; Monit will restart any instance that exits, thereby making the shutdown 111 ; Monit will restart any instance that exits, thereby making the shutdown
104 ; into a restart. 112 ; into a restart.
105 ;InworldRestartShutsDown = false 113 InworldRestartShutsDown = false
106 114
107 ; ## 115 ; ##
108 ; ## PRIM STORAGE 116 ; ## PRIM STORAGE
@@ -227,7 +235,6 @@
227 235
228 ; If enabled, enableFlySlow will change the primary fly state to 236 ; If enabled, enableFlySlow will change the primary fly state to
229 ; FLYSLOW, and the "always run" state will be the regular fly. 237 ; FLYSLOW, and the "always run" state will be the regular fly.
230
231 enableflyslow = false 238 enableflyslow = false
232 239
233 ; PreJump is an additional animation state, but it probably 240 ; PreJump is an additional animation state, but it probably
@@ -236,7 +243,6 @@
236 243
237 ; This is commented so it will come on automatically once it's 244 ; This is commented so it will come on automatically once it's
238 ; supported. 245 ; supported.
239
240 ; enableprejump = true 246 ; enableprejump = true
241 247
242 ; Simulator Stats URI 248 ; Simulator Stats URI
@@ -265,6 +271,7 @@
265 DelayBeforeAppearanceSave = 5 271 DelayBeforeAppearanceSave = 5
266 DelayBeforeAppearanceSend = 2 272 DelayBeforeAppearanceSend = 2
267 273
274
268[SMTP] 275[SMTP]
269 enabled=false 276 enabled=false
270 277
@@ -504,6 +511,10 @@
504 ; Distance in meters that shouts should travel. Default is 100m 511 ; Distance in meters that shouts should travel. Default is 100m
505 shout_distance = 100 512 shout_distance = 100
506 513
514[EntityTransfer]
515 ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis
516 ; This is set to 4095 because current viewers can't handle teleports that are greater than this distance
517 max_distance = 4095
507 518
508[Messaging] 519[Messaging]
509 ; Control which region module is used for instant messaging. 520 ; Control which region module is used for instant messaging.
@@ -855,11 +866,6 @@
855 ;exclude_list=User 1,User 2,User 3 866 ;exclude_list=User 1,User 2,User 3
856 867
857 868
858[CMS]
859 enabled = false
860 ;channel = 345
861
862
863; The following settings control the progression of daytime 869; The following settings control the progression of daytime
864; in the Sim. The defaults are the same as the commented out settings 870; in the Sim. The defaults are the same as the commented out settings
865[Sun] 871[Sun]
@@ -1120,6 +1126,12 @@
1120 ;; Path to script assemblies 1126 ;; Path to script assemblies
1121 ; ScriptEnginesPath = "ScriptEngines" 1127 ; ScriptEnginesPath = "ScriptEngines"
1122 1128
1129 ; Whether to delete previously compiled scripts when the sim starts. If you disable this
1130 ; then startup will be faster. However, then it becomes your responsibility to delete the
1131 ; compiled scripts if OpenSim has changed enough that previously compiled scripts are no
1132 ; longer compatible.
1133 DeleteScriptsOnStartup = true
1134
1123 1135
1124[OpenGridProtocol] 1136[OpenGridProtocol]
1125 ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know.. 1137 ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know..
diff --git a/bin/addon-modules/README b/bin/addon-modules/README
deleted file mode 100644
index 120dbc9..0000000
--- a/bin/addon-modules/README
+++ /dev/null
@@ -1 +0,0 @@
1Place .ini files here to have them picked up automatically
diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index ad38ad1..cd39f8c 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -19,9 +19,12 @@
19 ; 0 to disable 19 ; 0 to disable
20 HitRateDisplay = 100 20 HitRateDisplay = 100
21 21
22 ; Set to false for disk cache only. 22 ; Set to false for no memory cache
23 MemoryCacheEnabled = false 23 MemoryCacheEnabled = false
24 24
25 ; Set to false for no file cache
26 FileCacheEnabled = true
27
25 ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes 28 ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
26 ; Optimization: for VPS or limited memory system installs set Timeout to .016 (1 minute) 29 ; Optimization: for VPS or limited memory system installs set Timeout to .016 (1 minute)
27 ; increases performance without large memory impact 30 ; increases performance without large memory impact
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index cbe3fa0..ee0523f 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -63,9 +63,6 @@
63 ;;--- For MySql region storage (alternative) 63 ;;--- For MySql region storage (alternative)
64 ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" 64 ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
65 65
66 ;; With hypergrid, perform distance check for the creation of a linked region
67 ; Check4096 = true
68
69 ;; Directory for map tile images of remote regions 66 ;; Directory for map tile images of remote regions
70 ; MapTileDirectory = "./maptiles" 67 ; MapTileDirectory = "./maptiles"
71 68