aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example20
-rw-r--r--bin/OpenSimDefaults.ini56
2 files changed, 51 insertions, 25 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 1ea4609..992838f 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -264,7 +264,7 @@
264 ; AllowedClients = 264 ; AllowedClients =
265 265
266 ;# {BannedClients} {} {Bar (|) separated list of banned clients} {} 266 ;# {BannedClients} {} {Bar (|) separated list of banned clients} {}
267 ;# Bar (|) separated list of viewers which may not gain access to the regions. 267 ;; Bar (|) separated list of viewers which may not gain access to the regions.
268 ;; One can use a Substring of the viewer name to disable only certain 268 ;; One can use a Substring of the viewer name to disable only certain
269 ;; versions 269 ;; versions
270 ;; Example: Agent uses the viewer "Imprudence 1.3.2.0" 270 ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
@@ -283,7 +283,7 @@
283 ;; both to set this to false and comment out the [Modules] MapImageServiceModule setting in config-include/ 283 ;; both to set this to false and comment out the [Modules] MapImageServiceModule setting in config-include/
284 ; GenerateMaptiles = true 284 ; GenerateMaptiles = true
285 285
286 ;# {MapImageModule} [] {The map image module to use} {MapImageModule Warp3DImageModule} MapImageModule 286 ;# {MapImageModule} {} {The map image module to use} {MapImageModule Warp3DImageModule} MapImageModule
287 ;; The module to use in order to generate map images. 287 ;; The module to use in order to generate map images.
288 ;; MapImageModule is the default. Warp3DImageModule is an alternative experimental module that can 288 ;; MapImageModule is the default. Warp3DImageModule is an alternative experimental module that can
289 ;; generate better images. 289 ;; generate better images.
@@ -470,7 +470,10 @@
470 ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800 470 ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800
471 ;XmlRpcPort = 20800 471 ;XmlRpcPort = 20800
472 472
473 ;# {XmlRpcHubURI} {XmlRpcRouterModule} {URI for external service used to register xmlrpc channels created in the simulator. This depends on XmlRpcRouterModule being set to XmlRpcGridRouterModule} http://example.com 473
474;; {option} {depends on} {question to ask} {choices} default value
475
476 ;# {XmlRpcHubURI} {XmlRpcRouterModule} {URI for external service used to register xmlrpc channels created in the simulator. This depends on XmlRpcRouterModule being set to XmlRpcGridRouterModule} {} http://example.com
474 ;; If XmlRpcRouterModule is set to XmlRpcGridRouterModule, the simulator 477 ;; If XmlRpcRouterModule is set to XmlRpcGridRouterModule, the simulator
475 ;; will use this address to register xmlrpc channels on the external 478 ;; will use this address to register xmlrpc channels on the external
476 ;; service 479 ;; service
@@ -534,7 +537,7 @@
534 ;; Distance in meters that ordinary chat should travel. 537 ;; Distance in meters that ordinary chat should travel.
535 ; say_distance = 20 538 ; say_distance = 20
536 539
537 ;# {shout_distance} {Distance at which a shout is heard, in meters?} {} 100 540 ;# {shout_distance} {} {Distance at which a shout is heard, in meters?} {} 100
538 ;; Distance in meters that shouts should travel. 541 ;; Distance in meters that shouts should travel.
539 ; shout_distance = 100 542 ; shout_distance = 100
540 543
@@ -609,7 +612,8 @@
609 ;; the "password" parameter) 612 ;; the "password" parameter)
610 ; access_password = "" 613 ; access_password = ""
611 614
612 ;# List the IP addresses allowed to call RemoteAdmin 615 ;# {access_ip_addresses} {enabled:true} {List the IP addresses allowed to call RemoteAdmin?} {}
616 ;; List the IP addresses allowed to call RemoteAdmin
613 ;; If access_ip_addresses isn't set, then all IP addresses can access RemoteAdmin. 617 ;; If access_ip_addresses isn't set, then all IP addresses can access RemoteAdmin.
614 ;; access_ip_addresses = 0.0.0.0, 0.0.0.0 ... 618 ;; access_ip_addresses = 0.0.0.0, 0.0.0.0 ...
615 ; access_ip_addresses = 619 ; access_ip_addresses =
@@ -794,7 +798,7 @@
794 ; ScriptStopStrategy = abort 798 ; ScriptStopStrategy = abort
795 799
796 800
797 ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} (true false) true 801 ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} {true false} true
798 ;; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false 802 ;; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
799 ;; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the 803 ;; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
800 ;; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used 804 ;; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
@@ -947,6 +951,10 @@
947 ;; Enables the groups module 951 ;; Enables the groups module
948 ; Enabled = false 952 ; Enabled = false
949 953
954 ;# {LevelGroupCreate} {Enabled:true} {User level for creating groups} {} 0
955 ;; Minimum user level required to create groups
956 ;LevelGroupCreate = 0
957
950 ;# {Module} {Enabled:true} {Groups module to use? (Use GroupsModule to use Flotsam/Simian)} {Default "Groups Module V2"} Default 958 ;# {Module} {Enabled:true} {Groups module to use? (Use GroupsModule to use Flotsam/Simian)} {Default "Groups Module V2"} Default
951 ;; The default module can use a PHP XmlRpc server from the Flotsam project at 959 ;; The default module can use a PHP XmlRpc server from the Flotsam project at
952 ;; http://code.google.com/p/flotsam/ 960 ;; http://code.google.com/p/flotsam/
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 3a961d6..f28dd3e 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -915,54 +915,72 @@
915 ; ## Joint support 915 ; ## Joint support
916 ; ## 916 ; ##
917 917
918 ; if you would like physics joints to be enabled through a special naming convention in the client, set this to true. 918 ; If you would like physics joints to be enabled through a special naming
919 ; (see NINJA Physics documentation, http://opensimulator.org/wiki/NINJA_Physics) 919 ; convention in the client, set this to true.
920 ; default is false 920 ; (See NINJA Physics documentation, http://opensimulator.org/wiki/NINJA_Physics)
921 ; Default is false
921 ;use_NINJA_physics_joints = true 922 ;use_NINJA_physics_joints = true
922 923
923 ; ## 924 ; ##
924 ; ## additional meshing options 925 ; ## additional meshing options
925 ; ## 926 ; ##
926 927
927 ; physical collision mesh proxies are normally created for complex prim shapes, and collisions for simple boxes and 928 ; Physical collision mesh proxies are normally created for complex prim shapes,
928 ; spheres are computed algorithmically. If you would rather have mesh proxies for simple prims, you can set this to 929 ; and collisions for simple boxes and spheres are computed algorithmically.
929 ; true. Note that this will increase memory usage and region startup time. Default is false. 930 ; If you would rather have mesh proxies for simple prims, you can set this to
931 ; true. Note that this will increase memory usage and region startup time.
932 ; Default is false.
930 ;force_simple_prim_meshing = true 933 ;force_simple_prim_meshing = true
931 934
932[BulletSim] 935[BulletSim]
933 ; All the BulletSim parameters can be displayed with the console command "physics get all" 936 ; All the BulletSim parameters can be displayed with the console command
934 ; and all are defined in the source file OpenSim/Regions/Physics/BulletSPlugin/BSParam.cs. 937 ; "physics get all" and all are defined in the source file
938 ; OpenSim/Regions/Physics/BulletSPlugin/BSParam.cs.
935 939
936 ; There are two bullet physics libraries, bulletunmanaged is the default and is a native c++ dll 940 ; There are two bullet physics libraries, bulletunmanaged is the default and is a
937 ; bulletxna is a managed C# dll. They have comparible functionality but the c++ one is much faster. 941 ; native c++ dll bulletxna is a managed C# dll. They have comparible functionality
942 ; but the c++ one is much faster.
938 BulletEngine = "bulletunmanaged" 943 BulletEngine = "bulletunmanaged"
939 ; BulletEngine = "bulletxna" 944 ; BulletEngine = "bulletxna"
940 945
941 ; Terrain Implementation 946 ; BulletSim can run on its own thread independent of the simulator's heartbeat
942 TerrainImplementation = 1 ; 0=Heightfield, 1=mesh 947 ; thread. Enabling this will nto let the physics engine slow down avatar movement, etc.
943 ; For mesh terrain, the detail of the created mesh. '1' gives 256x256 (heightfield resolution). '2' 948 UseSeparatePhysicsThread = false
944 ; gives 512x512. Etc. Cannot be larger than '4'. Higher magnification uses lots of memory. 949
950 ; Terrain implementation can use either Bullet's heightField or BulletSim can build
951 ; a mesh. 0=heightField, 1=mesh
952 TerrainImplementation = 1
953 ; For mesh terrain, the detail of the created mesh. '1' gives 256x256 (heightfield
954 ; resolution). '2' gives 512x512. Etc. Cannot be larger than '4'. Higher
955 ; magnification uses lots of memory.
945 TerrainMeshMagnification = 2 956 TerrainMeshMagnification = 2
946 957
947 ; Avatar physics height adjustments. http://opensimulator.org/wiki/BulletSim#Adjusting_Avatar_Height 958 ; Avatar physics height adjustments.
959 ; http://opensimulator.org/wiki/BulletSim#Adjusting_Avatar_Height
948 AvatarHeightLowFudge = -0.2 ; Adjustment at low end of height range 960 AvatarHeightLowFudge = -0.2 ; Adjustment at low end of height range
949 AvatarHeightMidFudge = 0.1 ; Adjustment at mid point of avatar height range 961 AvatarHeightMidFudge = 0.1 ; Adjustment at mid point of avatar height range
950 AvatarHeightHighFudge = 0.1 ; Adjustment at high end of height range 962 AvatarHeightHighFudge = 0.1 ; Adjustment at high end of height range
951 963
952 ; Default linkset implmentation 964 ; Default linkset implmentation
953 ; 'Constraint' uses physics constraints to hold linkset together. 'Compound' builds a compound 965 ; 'Constraint' uses physics constraints to hold linkset together. 'Compound'
954 ; shape from the children shapes to create a single physical shape. 'Compound' uses a lot less CPU time. 966 ; builds a compound shape from the children shapes to create a single physical
967 ; shape. 'Compound' uses a lot less CPU time.
955 LinkImplementation = 1 ; 0=constraint, 1=compound 968 LinkImplementation = 1 ; 0=constraint, 1=compound
956 969
970 ; If 'true', offset a linkset's origin based on mass of linkset parts.
971 LinksetOffsetCenterOfMass = false
972
957 ; If 'true', turn scuplties into meshes 973 ; If 'true', turn scuplties into meshes
958 MeshSculptedPrim = true 974 MeshSculptedPrim = true
959 975
960 ; If 'true', force simple prims (box and sphere) to be meshed 976 ; If 'true', force simple prims (box and sphere) to be meshed
961 ; If 'false', the Bullet native special case shape is used for square rectangles and even dimensioned spheres 977 ; If 'false', the Bullet native special case shape is used for square rectangles
978 ; and even dimensioned spheres.
962 ForceSimplePrimMeshing = false 979 ForceSimplePrimMeshing = false
963 980
964 ; If 'true', when creating meshes, remove all triangles that have two equal vertexes. 981 ; If 'true', when creating meshes, remove all triangles that have two equal vertexes.
965 ; Happens often in sculpties. If turned off, there will be some doorways that cannot be walked through. 982 ; Happens often in sculpties. If turned off, there will be some doorways
983 ; that cannot be walked through.
966 ShouldRemoveZeroWidthTriangles = true 984 ShouldRemoveZeroWidthTriangles = true
967 985
968 ; If 'true', use convex hull definition in mesh asset if present. 986 ; If 'true', use convex hull definition in mesh asset if present.