Merge git://opensimulator.org/git/opensim

This commit is contained in:
Sean McNamara
2011-04-23 18:33:08 -04:00
111 changed files with 3341 additions and 2330 deletions

View File

@@ -1,3 +1,7 @@
; This file contains defaults for various settings in OpenSimulator. These can be overriden
; by changing the same setting in OpenSim.ini (once OpenSim.ini.example has been copied to OpenSim.ini).
[Startup]
; Set this to true if you want to log crashes to disk
; this can be useful when submitting bug reports.
@@ -10,15 +14,6 @@
; Place to create a PID file
; PIDFile = "/tmp/my.pid"
; Http proxy support for llHTTPRequest and dynamic texture loading
; Set HttpProxy to the URL for your proxy server if you would like
; to proxy llHTTPRequests through a firewall
; HttpProxy = "http://proxy.com"
; Set HttpProxyExceptions to a list of regular expressions for
; URLs that you don't want going through the proxy such as servers
; inside your firewall, separate patterns with a ';'
; HttpProxyExceptions = ".mydomain.com;localhost"
startup_console_commands_file = "startup_commands.txt"
shutdown_console_commands_file = "shutdown_commands.txt"
@@ -154,12 +149,6 @@
; to false if you have compatibility problems.
;CacheSculptMaps = true
; if you use Meshmerizer and want collisions for meshies, setting this to true
; will cause OpenSim to attempt to decode meshies assets, extract the physics
; mesh, and use it for collisions. This is currently experimental code and enabling
; it may cause unexpected physics problems.
;UseMeshiesPhysicsMesh = false
; Choose one of the physics engines below
; OpenDynamicsEngine is by some distance the most developed physics engine
; basicphysics effectively does not model physics at all, making all objects phantom
@@ -287,6 +276,7 @@
;SMTP_SERVER_LOGIN=foo
;SMTP_SERVER_PASSWORD=bar
[Network]
ConsoleUser = "Test"
ConsolePass = "secret"
@@ -317,6 +307,7 @@
; " (Mozilla Compatible)" to the text where there are problems with a web server
;user_agent = "OpenSim LSL (Mozilla Compatible)"
[XMLRPC]
; ##
; ## Scripting XMLRPC mapper
@@ -330,6 +321,7 @@
;XmlRpcRouterModule = "XmlRpcRouterModule"
;XmlRpcPort = 20800
[ClientStack.LindenUDP]
; Set this to true to process incoming packets asynchronously. Networking is
; already separated from packet handling with a queue, so this will only
@@ -422,6 +414,7 @@
;
;DisableFacelights = "false"
[Chat]
; Controls whether the chat module is enabled. Default is true.
enabled = true;
@@ -450,6 +443,25 @@
; ForwardOfflineGroupMessages = true
[Inventory]
; Control whether multiple objects sent to inventory should be coaleseced into a single item
; There are still some issues with coalescence, including the fact that rotation is not restored
; and some assets may be missing from archive files.
CoalesceMultipleObjectsToInventory = true
[Mesh]
; enable / disable Collada mesh support
; default is true
; AllowMeshUpload = true
; if you use Meshmerizer and want collisions for meshies, setting this to true
; will cause OpenSim to attempt to decode meshies assets, extract the physics
; mesh, and use it for collisions. This is currently experimental code and enabling
; it may cause unexpected physics problems.
;UseMeshiesPhysicsMesh = false
[ODEPhysicsSettings]
;##
;## World Settings
@@ -680,6 +692,7 @@
; path to default appearance XML file that specifies the look of the default avatars
;default_appearance = default_appearance.xml
[RestPlugins]
; Change this to true to enable REST Plugins. This must be true if you wish to use
; REST Region or REST Asset and Inventory Plugins
@@ -706,11 +719,10 @@
flush-on-error = true
; Uncomment the following for IRC bridge
; experimental, so if it breaks... keep both parts... yada yada
; IRC bridge is experimental, so if it breaks... keep both parts... yada yada
; also, not good error detection when it fails
;[IRC]
;enabled = true ; you need to set this otherwise it won't connect
[IRC]
enabled = false; you need to set this to true otherwise it won't connect
;server = name.of.irc.server.on.the.net
;; user password - only use this if the server requires one
;password = mypass
@@ -767,14 +779,14 @@
;exclude_list=User 1,User 2,User 3
;[CMS]
;enabled = true
[CMS]
enabled = false
;channel = 345
; Uncomment the following to control the progression of daytime
; in the Sim. The defaults are what is shown below
;[Sun]
; The following settings control the progression of daytime
; in the Sim. The defaults are the same as the commented out settings
[Sun]
; number of wall clock hours for an opensim day. 24.0 would mean realtime
;day_length = 4
; Year length in days
@@ -821,12 +833,13 @@
; default is 1000
cloud_update_rate = 1000
[LightShare]
[LightShare]
; This enables the transmission of Windlight scenes to supporting clients, such as the Meta7 viewer.
; It has no ill effect on viewers which do not support server-side windlight settings.
; Currently we only have support for MySQL databases.
enable_windlight = false;
enable_windlight = false
[Trees]
; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying
@@ -838,7 +851,6 @@
[VectorRender]
; the font to use for rendering text (default: Arial)
; font_name = "Arial"
@@ -1032,6 +1044,7 @@
;; Path to script assemblies
; ScriptEnginesPath = "ScriptEngines"
[OpenGridProtocol]
;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know..
;On/true or Off/false
@@ -1240,11 +1253,11 @@
ChildReprioritizationDistance = 20.0
[WebStats]
; View region statistics via a web page
; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page
; Use a web browser and type in the "Login URI" + "/SStats/"
; For example- http://127.0.0.1:9000/SStats/
[WebStats]
; enabled=false