1 files changed, 266 insertions, 309 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index a42c831..db7d5c0 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -28,6 +28,9 @@
     ; How many lines of command history should we keep? (default is 100)
     ConsoleHistoryFileLines = 100
 
+    ; Time stamp commands in history file (default false)
+     ConsoleHistoryTimeStamp = true
+
     ; Set this to true if you want to log crashes to disk
     ; this can be useful when submitting bug reports.
     ; However, this will only log crashes within OpenSimulator that cause the entire program to exit
@@ -60,16 +63,8 @@
     ; ##
 
     ; Sets the method that OpenSim will use to fire asynchronous
-    ; events. Valid values are UnsafeQueueUserWorkItem,
-    ; QueueUserWorkItem, BeginInvoke, SmartThreadPool, and Thread.
-    ;
-    ; SmartThreadPool is reported to work well on Mono/Linux, but
-    ; UnsafeQueueUserWorkItem has been benchmarked with better
-    ; performance on .NET/Windows
-    ;
-    ; UnsafeQueueUserWorkItem refers to the fact that the code creating the event could elevate its security
-    ; privileges.  However, as calling code is trusted anyway this is safe (if you set
-    ;  TrustedBinaries = true in the [XEngine] section then you already have to trust that incoming code for other reasons).
+    ; events. Valid values are ,
+    ; QueueUserWorkItem, SmartThreadPool, and Thread.
     async_call_method = SmartThreadPool
 
     ; Max threads to allocate on the FireAndForget thread pool
@@ -175,12 +170,10 @@
     ; limit the maximum view range ( no effect still (does limit MaxRegionsViewDistance) )
     MaxDrawDistance = 1024
 
-    ; the maximum distance to tell a viewer to connect to a neighbour region, so it can be seen
-    ; (it is limited by MaxDrawDistance above)
-    ; less than 256 shows imediate neighbours; 512 also second imediate neighbours etc
-    ; more than 512m can cause viewers problems specially in case of dense regions.
-    ; curretly this distance is from current region borders.
+    ; Other regions visibility depends on avatar position and view range
+    ; the view range considered is limited the maximum and minimum distances:
     MaxRegionsViewDistance = 1024
+    MinRegionsViewDistance = 96
 
     ; If you have only one region in an instance, or to avoid the many bugs
     ; that you can trigger in modules by restarting a region, set this to
@@ -327,6 +320,10 @@
 
     ;; Default script engine to use. Currently, we only have XEngine
     DefaultScriptEngine = "XEngine"
+    ;; ***DANGER***DANGER***
+    ;; experimental engine
+    ;; see section [YEngine] below
+    ; DefaultScriptEngine = "YEngine"
 
     ; Http proxy setting for llHTTPRequest and dynamic texture loading, if
     ; required
@@ -416,6 +413,13 @@
     ; default is false
     TelehubAllowLandmark = true
 
+[AccessControl]
+    ; Viewer-based access control. |-separated list of allowed viewers.
+    ; AllowedClients = ""
+
+    ; Viewer-based access control. |-separated list of denied viewers.
+    ; No restrictions by default.
+    ; DeniedClients = ""
 
 ; Normally this section goes in the ThisSim.ini file, but this is common for all.
 [Region]
@@ -423,6 +427,18 @@
     ExternalHostName = "${Const|HostName}"
 
 
+    ; #
+    ; # SSL certificates validation options
+    ; #
+
+    ; SSL certificate validation options
+    ; you can allow selfsigned certificates or no official CA with next option set to true
+    ; NoVerifyCertChain = true
+    ; you can also bypass the hostname or domain verification
+    ; NoVerifyCertHostname = true
+    ; having both options true does provide encryption but with low security
+    ; set both true if you don't care to use SSL, they are needed to contact regions or grids that do use it.
+
 [Map]
     ; Map tile options.
     ; If true, then maptiles are generated using the MapImageModule below.
@@ -436,7 +452,7 @@
     ; The module to use in order to generate map images.
     ; MapImageModule is the default.  Warp3DImageModule is an alternative experimental module that can
     ; generate better images.
-    MapImageModule = "Warp3DImageModule"
+    MapImageModule = "Warp3DCachedImageModule"
 
     ; World map blacklist timeout in seconds
     ;BlacklistTimeout = 600
@@ -461,7 +477,19 @@
     TexturePrimSize = 1
 
     ; Attempt to render meshes and sculpties on the map
-    RenderMeshes = true;
+    RenderMeshes = false
+
+    ; warp3D rendering height limits for prims (relative to rez position not bounding box)
+    ; prims above RenderMaxHeight are excluded
+    ; valid values: 100 to 4086
+    RenderMaxHeight = 4086
+
+    ; prims below RenderMinHeight are excluded
+    ; valid values: -100 to RenderMaxHeight - 10
+    RenderMinHeight = -100
+
+    ; Show NPCs as green world map dots
+    ShowNPCs = false
 
     ; where to store cached map tiles.
     CacheDirectory = "${Paths|CachePath}/MapImageCache"
@@ -470,7 +498,7 @@
     enablePosition = true
 
     ; Refresh the cached map tile once a month.
-    ;RefreshEveryMonth = true
+    RefreshEveryMonth = true
 
     ;# {MapColorWater} {} {Water color for textured and shaded maps} {"#1D475F"}
     ; MapColorWater = "#3399FF"
@@ -509,13 +537,14 @@
 
     ; This allows grid users with a UserLevel of 200 or more to assume god
     ; powers in the regions in this simulator.
+    ; if you don't trust grid admins, what are you doing there?
     allow_grid_gods = true
 
     ; Allow region owners to assume god powers in their regions
-    ;region_owner_is_god = true
+    region_owner_is_god = false
 
     ; Allow region managers to assume god powers in regions they manage
-    ;region_manager_is_god = false
+    region_manager_is_god = false
 
     ; God mode should be turned on in the viewer whenever
     ; the user has god rights somewhere. They may choose
@@ -525,7 +554,7 @@
     ; The user can execute any and all god functions, as
     ; permitted by the viewer UI, without actually "godding
     ; up". This is the default state in 0.8.2.
-    implicit_gods = true
+    implicit_gods = false
 
     ; Control user types that are allowed to create new scripts
     ; Only enforced if serviceside_object_permissions is true
@@ -556,32 +585,6 @@
     ;LevelUpload = 0
 
 
-[RegionReady]
-    ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
-    enabled = true
-
-    ; Channel on which to signal region readiness through a message
-    ; formatted as follows: "{server_startup|oar_file_load},{0|1},n,[oar error]"
-    ; - the first field indicating whether this is an initial server startup
-    ; - the second field is a number indicating whether the OAR file loaded ok (1 == ok, 0 == error)
-    ; - the third field is a number indicating how many scripts failed to compile
-    ; - "oar error" if supplied, provides the error message from the OAR load
-    channel_notify = 0
-
-    ; - disallow logins while scripts are loading
-    ; Instability can occur on regions with 100+ scripts if users enter before they have finished loading
-    login_disable = false
-
-    ; - send an alert as json to a service
-    ; alert_uri = "http://myappserver.net/my_handler/"
-
-
-[EstateManagement]
-    ; If false, then block any region restart requests from the client even if they are otherwise valid.
-    ; Default is true
-    AllowRegionRestartFromClient = true
-
-
 [Estates]
     ; If these values are commented out then the user will be asked for estate details when required (this is the normal case).
     ; If these values are uncommented then they will be used to create a default estate as necessary.
@@ -613,8 +616,34 @@
     ;; Password for the default estate owner
     ; DefaultEstateOwnerPassword = password
 
+[RegionReady]
+    ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
+    enabled = true
+
+    ; Channel on which to signal region readiness through a message
+    ; formatted as follows: "{server_startup|oar_file_load},{0|1},n,[oar error]"
+    ; - the first field indicating whether this is an initial server startup
+    ; - the second field is a number indicating whether the OAR file loaded ok (1 == ok, 0 == error)
+    ; - the third field is a number indicating how many scripts failed to compile
+    ; - "oar error" if supplied, provides the error message from the OAR load
+    channel_notify = 0
+
+    ; - disallow logins while scripts are loading
+    ; Instability can occur on regions with 100+ scripts if users enter before they have finished loading
+    login_disable = false
+
+    ; - send an alert as json to a service
+    ; alert_uri = "http://myappserver.net/my_handler/"
+
+
+[EstateManagement]
+    ; If false, then block any region restart requests from the client even if they are otherwise valid.
+    ; Default is true
+    AllowRegionRestartFromClient = false
+
 
 [UserProfiles]
+  ;# {ProfileURL} {} {Set url to UserProfilesService} {}
   ;; Set the value of the url to your UserProfilesService
   ;; If un-set / "" the module is disabled
   ;; If the ProfileServiceURL is not set, then very BASIC
@@ -630,36 +659,15 @@
 
 
 [SMTP]
-    ;; The SMTP server enabled the email module to send email to external
-    ;; destinations.
-
-    ;# {enabled} {[Startup]emailmodule:DefaultEmailModule} {Enable SMTP service?} {true false} false
-    ;; Enable sending email via SMTP
     enabled = false
 
-    ;# {internal_object_host} {[Startup]emailmodule:DefaultEmailModule enabled:true} {Host name to treat as internal (object to object) email?} {} lsl.opensim.local
-    ; internal_object_host = lsl.opensim.local
-
-    ;# {host_domain_header_from} {[Startup]emailmodule:DefaultEmailModule enabled:true} {From address to use in the sent email header?} {} 127.0.0.1
-    ; host_domain_header_from = "127.0.0.1"
-
-    ;# {email_pause_time} {[Startup]emailmodule:DefaultEmailModule enabled:true} {Period in seconds to delay after an email is sent.} {} 20
-    ; email_pause_time = 20
-
-    ;# {email_max_size} {[Startup]emailmodule:DefaultEmailModule enabled:true} {Maximum total size of email in bytes.} {} 4096
-    ; email_max_size = 4096
-
-    ;# {SMTP_SERVER_HOSTNAME} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server name?} {} 127.0.0.1
-    ; SMTP_SERVER_HOSTNAME = "127.0.0.1"
-
-    ;# {SMTP_SERVER_PORT} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server name?} {SMTP server port?} {} 25
-    ; SMTP_SERVER_PORT = 25
-
-    ;# {SMTP_SERVER_LOGIN} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server user name?} {}
-    ; SMTP_SERVER_LOGIN = ""
-
-    ;# {SMTP_SERVER_PASSWORD} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server password} {}
-    ; SMTP_SERVER_PASSWORD = ""
+    ;enabled = true
+    ;internal_object_host = lsl.opensim.local
+    ;host_domain_header_from = 127.0.0.1
+    ;SMTP_SERVER_HOSTNAME = 127.0.0.1
+    ;SMTP_SERVER_PORT = 25
+    ;SMTP_SERVER_LOGIN = foo
+    ;SMTP_SERVER_PASSWORD = bar
 
 
 [Network]
@@ -667,24 +675,21 @@
     ;; unless you use -console=rest at startup.
     ;ConsoleUser = "Test"
     ;ConsolePass = "secret"
-    ;console_port = 0
-
-    ;# {http_listener_port} {} {TCP Port for this simulator to listen on? (This must be unique to the simulator!)} {} 9000
-    ;; Simulator HTTP port. This is not the region port, but the port the
-    ;; entire simulator listens on. This port uses the TCP protocol, while
-    ;; the region ports use UDP.
     ;http_listener_port = 9000
+    ;console_port = 0
 
-    ; ssl config: Experimental!  The auto https config only really works definately on windows XP now
-    ; you need a Cert Request/Signed pair installed in the MY store with the CN specified below
-    ; you can use https on other platforms, but you'll need to configure the httpapi yourself for now
-    http_listener_ssl = false ; Also create a SSL server
-    http_listener_cn = "localhost" ; Use the cert with the common name
+    ; ssl config: Experimental!
+    http_listener_ssl = false ; if set to true main server is replaced by a ssl one
     http_listener_sslport = 9001 ; Use this port for SSL connections
-    http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer
-
-    ; HTTPS for "Out of band" management applications such as the remote
-    ; admin module
+    ; currently if using ssl, regions ExternalHostName must the the same and equal to http_listener_cn
+    ; this will change is future
+    http_listener_cn = "myRegionsExternalHostName"
+    ; if the cert doesnt have a oficial CA or is selfsigned viewers option NoVerifySSLCert need to be set true
+    http_listener_cert_path = "mycert.p12" ; path for the cert file that is valid for the ExternalHostName
+    http_listener_cert_pass = "mycertpass" ; the cert passwork
+
+    ; additional HTTPS for "Out of band" management applications such as the remote
+    ; admin module or scripts
     ;
     ; Create https_listener = "True" will create a listener on the port
     ; specified. Provide the path to your server certificate along with it's
@@ -692,49 +697,19 @@
     ; https_listener = False
     ; Set our listener to this port
     ; https_port = 0
-    ; Path to X509 certificate
+    ; Path to X509 certificate, can be the same as main or another
     ; cert_path = "path/to/cert.p12"
     ; Password for cert
     ; cert_pass = "password"
 
-    ; By default, OpenSimulator does not allow scripts to make HTTP calls to addresses on the simulator's LAN.
-    ; See the OutboundDisallowForUserScripts parameter in OpenSimDefaults.ini for more information on this filter.
-    ; If you need to allow scripts to make some LAN calls use the OutboundDisallowForUserScriptsExcept parameter below.
-    ; We recommend that you do not override OutboundDisallowForUserScripts directly unless you are very sure about what you're doing.
-    ;
-    ; You can whitelist individual endpoints by IP or FQDN, e.g.
-    ;
-    ; OutboundDisallowForUserScriptsExcept = 192.168.1.3:8003
-    ;
-    ; You can specify multiple addresses by separating them with a bar.  For example,
-    ;
-    ; OutboundDisallowForUserScriptsExcept = 192.168.1.3:8003|myinternalserver:8000
-    ;
-    ; If an address if given without a port number then port 80 is assumed
-    ;
-    ; You can also specify a network range in CIDR notation to whitelist, e.g.
-    ;
-    ; OutboundDisallowForUserScriptsExcept = 192.168.1.0/24
-    ;
-    ; to whitelist all ports on addresses 192.168.1.0 to 192.168.1.255
-    ; To specify an individual IP address use the /32 netmask
-    ;
-    ; OutboundDisallowForUserScriptsExcept = 192.168.1.2/32
-    ;
-    ; See http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notation for more information on CIDR notation
-
     ; Maximum bytes allowed for HTTP_BODY_MAXLENGTH.
     ; By default, llHTTPRequest limits the response body to 2048 bytes.
     ; This limit can be extended using HTTP_BODY_MAXLENGTH to a maximum
     ; of HttpBodyMaxLenMAX bytes.
-    ; Please be aware that the limit can be set to insanely high values,
-    ; effectively removing any limitation. This will expose your sim to a
-    ; known attack. It is not recommended to set this limit higher than
-    ; the highest value that is actually needed by existing applications!
-    ; 16384 is the SL compatible value.
     ; HttpBodyMaxLenMAX=16384
 
     ; Hostname to use in llRequestURL/llRequestSecureURL
+    ; must be a valid hostname for the ssl cert.
     ; if not defined - llRequestURL/llRequestSecureURL are disabled
     ; ExternalHostNameForLSL=127.0.0.1
     ExternalHostNameForLSL = "${Const|HostName}"
@@ -759,17 +734,33 @@
     ;
     ; OutboundDisallowForUserScripts = ""
 
+    ; You can whitelist individual endpoints by IP or FQDN, e.g.
+    ;
+    ; OutboundDisallowForUserScriptsExcept = 192.168.1.3:8003
+    ;
+    ; You can specify multiple addresses by separating them with a bar.  For example,
+    ;
+    ; OutboundDisallowForUserScriptsExcept = 192.168.1.3:8003|myinternalserver:8000
+    ;
+    ; If an address if given without a port number then port 80 is assumed
+    ;
+    ; You can also specify a network range in CIDR notation to whitelist, e.g.
+    ;
+    ; OutboundDisallowForUserScriptsExcept = 192.168.1.0/24
+    ;
+    ; to whitelist all ports on addresses 192.168.1.0 to 192.168.1.255
+    ; To specify an individual IP address use the /32 netmask
+    ;
+    ; OutboundDisallowForUserScriptsExcept = 192.168.1.2/32
+    ;
+    ; See http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notation for more information on CIDR notation
+
+
     ; What is reported as the "X-Secondlife-Shard"
     ; Defaults to the user server url if not set
     ; The old default is "OpenSim", set here for compatibility
     shard = "OpenSim"
 
-    ; What is reported as the "User-Agent" when using llHTTPRequest
-    ; Defaults to not sent if not set here. See the notes section in the wiki at
-    ; http://wiki.secondlife.com/wiki/LlHTTPRequest for comments on adding
-    ; " (Mozilla Compatible)" to the text where there are problems with a web server
-    ;user_agent = "OpenSim LSL (Mozilla Compatible)"
-
     ;; The following 3 variables are for HTTP Basic Authentication for the Robust services.
     ;; Use this if your central services in port 8003 need to be accessible on the Internet
     ;; but you want to protect them from unauthorized access. The username and password
@@ -780,32 +771,35 @@
     ;;
     ;; Any of these 3 variables above can be overriden in any of the service sections.
 
+    ; What is reported as the "User-Agent" when using llHTTPRequest
+    ; Defaults to not sent if not set here. See the notes section in the wiki at
+    ; http://wiki.secondlife.com/wiki/LlHTTPRequest for comments on adding
+    ; " (Mozilla Compatible)" to the text where there are problems with a web server
+    ;user_agent = "OpenSim LSL (Mozilla Compatible)"
+
     ; OpenSim can send multiple simultaneous requests for services such as asset
     ; retrieval. However, some versions of mono appear to hang when there are too
     ; many simultaneous requests, default is 30 and is currently applied only to assets
     ;MaxRequestConcurrency = 30
 
+[ScriptsHttpRequestModule]
+    ; options for llHttpRequest
 
-[AccessControl]
-    ; Viewer-based access control. |-separated list of allowed viewers.
-    ;; One can use a substring of the viewer name to enable only certain
-    ;; versions
-    ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
-    ;; - "Imprudence" has access
-    ;; - "Imprudence 1.3" has access
-    ;; - "Imprudence 1.3.1" has no access
-    ; AllowedClients = ""
+    ; max number of concurrent connections per instance (all scenes), default 8
+    ; MaxPoolThreads = 8
 
-    ; Viewer-based access control. |-separated list of denied viewers.
-    ;; One can use a Substring of the viewer name to disable only certain
-    ;; versions
-    ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
-    ;; - "Imprudence" has no access
-    ;; - "Imprudence 1.3" has no access
-    ;; - "Imprudence 1.3.1" has access
-    ; No restrictions by default.
-    ; DeniedClients = ""
+    ; max requests per second for all scripts on a prim, default 1
+    ;PrimRequestsPerSec = 1.0
+    ; initial unthrottled burst for all scripts on a prim, default 3
+    ;PrimRequestsBurst = 3.0
+
+    ; max requests per second for the objects owner (per instance), default 25
+    ;PrimOwnerRequestsPerSec = 25.0
+    ; initial unthrottled burst for the objects owner (per instance), default 5
+    ;PrimOwnerRequestsBurst = 5.0
 
+    ; requests timeout in miliseconds, range 200 to 60000, default 30000
+    ;RequestsTimeOut = 30000
 
 [XMLRPC]
     ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule
@@ -827,25 +821,7 @@
     ;; service
     ; XmlRpcHubURI = http://example.com
 
-
 [ClientStack.LindenUDP]
-    ; The client socket receive buffer size determines how many
-    ; incoming requests we can process; the default on .NET is 8192
-    ; which is about 2 4k-sized UDP datagrams. On mono this is
-    ; whatever the underlying operating system has as default; for
-    ; example, ubuntu 8.04 or SLES11 have about 111k, which is about
-    ; 27 4k-sized UDP datagrams (on linux platforms you can [as root]
-    ; do "sysctl net.core.rmem_default" to find out what your system
-    ; uses a default socket receive buffer size.
-    ;
-    ; client_socket_rcvbuf_size allows you to specify the receive
-    ; buffer size LLUDPServer should use. NOTE: this will be limited
-    ; by the system's settings for the maximum client receive buffer
-    ; size (on linux systems you can set that with "sysctl -w
-    ; net.core.rmem_max=X")
-    ;
-    ;client_socket_rcvbuf_size = 8388608
-
     ; Maximum outbound bytes per second for a single scene. This can be used to
     ; throttle total outbound UDP traffic for a simulator. The default value is
     ; 0, meaning no throttling at the scene level. The example given here is
@@ -871,34 +847,11 @@
     ; clients login by starting each connection more slowly. Disabled by
     ; default
     ;
-    enable_adaptive_throttles = true
-
-    ; Per-client bytes per second rates for the various throttle categories.
-    ; These are default values that will be overridden by clients. These
-    ; defaults are approximately equivalent to the throttles set by the Imprudence
-    ; viewer when maximum bandwidth is set to 350kbps
-
-    ;resend_default = 6625
-    ;land_default = 9125
-    ;wind_default = 1750
-    ;cloud_default = 1750
-    ;task_default = 18500
-    ;texture_default = 18500
-    ;asset_default = 10500
-
-    ; Configures how ObjectUpdates are aggregated. These numbers
-    ; do not literally mean how many updates will be put in each
-    ; packet that goes over the wire, as packets are
-    ; automatically split on a 1400 byte boundary. These control
-    ; the balance between responsiveness of interest list updates
-    ; and total throughput. Higher numbers will ensure more full-
-    ; sized packets and faster sending of data, but more delay in
-    ; updating interest lists
-    ;
-    ;PrimUpdatesPerCallback = 100
+    enable_adaptive_throttles = false
+
 
     ; TextureSendLimit determines how many packets will be put on
-    ; the outgoing queue each cycle. Like the settings above, this
+    ; the lludp outgoing queue each cycle. Like the settings above, this
     ; is a balance between responsiveness to priority updates and
     ; total throughput. Higher numbers will give a better
     ; throughput at the cost of reduced responsiveness to client
@@ -906,16 +859,6 @@
     ;
     ;TextureSendLimit = 20
 
-    ; CannibalizeTextureRate allows bandwidth to be moved from the
-    ; UDP texture throttle to the task throttle. Since most viewers
-    ; use HTTP textures, this provides a means of using what is largely
-    ; unused bandwidth in the total throttle. The value is the proportion
-    ; of the texture rate to move to the task queue. It must be between
-    ; 0.0 (none of the bandwidth is cannibalized) and 0.9 (90% of the
-    ; bandwidth is grabbed)
-    ;
-    ; CannibalizeTextureRate = 0.5
-
     ; Quash and remove any light properties from attachments not on the
     ; hands. This allows flashlights and lanterns to function, but kills
     ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps
@@ -936,6 +879,11 @@
     ;
     ;PausedAckTimeout = 300
 
+    ; Support viewers object cache, default true
+    ; users may need to reduce viewer bandwitdh if some prims or terrain parts fail to rez.
+    ; change to false if you need to use old viewers that do not support this feature
+    ;
+    ; SupportViewerObjectsCache = true
 
 [ClientStack.LindenCaps]
     ;; Long list of capabilities taken from
@@ -943,18 +891,13 @@
     ;; Not all are supported by OpenSim. The ones supported are
     ;; set to localhost. These defaults can be overwritten
     ;; in OpenSim.ini
-    ;; Possible values are:
-    ;;   "" -- empty, capability disabled
-    ;;   "localhost" -- capability enabled and served by the simulator
-    ;;   "<url>" -- capability enabled and served by some other server
-    ;;
-    ; These are enabled by default to localhost. Change if you see fit.
     ;;
     Cap_AttachmentResources = ""
     Cap_ChatSessionRequest = ""
     Cap_CopyInventoryFromNotecard = "localhost"
     Cap_DispatchRegionInfo = ""
-    Cap_EstateChangeInfo = ""
+    Cap_EstateAccess = "localhost"
+    Cap_EstateChangeInfo = "localhost"
     Cap_EnvironmentSettings = "localhost"
     Cap_EventQueueGet = "localhost"
     Cap_FetchInventory = ""
@@ -965,6 +908,8 @@
     Cap_GetDisplayNames = "localhost"
     Cap_GetTexture = "localhost"
     Cap_GetMesh = "localhost"
+    Cap_GetMesh2 = "localhost"
+    ; Cap_GetAsset = "localhost"  Do not uncoment this line. Some popular viewers still dont do it right for opensim. Here to easy testing
     Cap_GetObjectCost = ""
     Cap_GetObjectPhysicsData = ""
     Cap_GroupProposalBallot = ""
@@ -989,7 +934,7 @@
     Cap_SendPostcard = ""
     Cap_SendUserReport = ""
     Cap_SendUserReportWithScreenshot = ""
-    Cap_ServerReleaseNotes = ""
+    Cap_ServerReleaseNotes = "localhost"
     Cap_SimConsole = ""
     Cap_SimulatorFeatures = ""
     Cap_SetDisplayName = ""
@@ -1019,7 +964,6 @@
     ; Capability for searching for people
     Cap_AvatarPickerSearch = "localhost"
 
-
 [SimulatorFeatures]
     ;# {SearchServerURI} {} {URL of the search server} {}
     ;; Optional. If given this serves the same purpose as the grid wide
@@ -1049,6 +993,14 @@
 
 
 [EntityTransfer]
+    ; The maximum distance in regions that an agent is allowed to teleport
+    ; along the x or y axis. This is set to 65535 because current viewers
+    ; can't handle teleports that are greater than this distance
+    ; Setting to 0 will allow teleports of any distance
+    ; The viewers got fixed long ago.
+    ;
+    max_distance = 0
+
     ; Allow avatars to cross into and out of the region.
     AllowAvatarCrossing = true
 
@@ -1148,11 +1100,10 @@
     ; Defaults to true - only set to false for debugging purposes
     Enabled = true
 
-    ; Controls the number of milliseconds that are slept per 100 prims rezzed in attachments
-    ; Experimental setting to control CPU spiking when avatars with many attachments login/change outfit
-    ; or when multiple avatars with medium level attachments login/change outfit simultaneously.
-    ; If 0 then no throttling is performed.
-    ThrottlePer100PrimsRezzed = 0
+    ; Inventory object wear did replace all the worn objects on same attachment point
+    ; if this option is set false, only oldest worn object will be replaced on that point.
+    ; true will do as older versions
+    ;WearReplacesAll = true
 
 
 [Mesh]
@@ -1185,6 +1136,7 @@
     ;MeshFileCacheExpireHours = 48
 
 
+
 [Textures]
     ; If true, textures generated dynamically (i.e. through osSetDynamicTextureData() and similar OSSL functions) are reused where possible
     ; Chiefly, reuse occurs if a texture has already been generated with identical data and settings, and that texture contains no dynamic components
@@ -1366,9 +1318,6 @@
     ; ##
 
     ; Do we want to mesh sculpted prim to collide like they look?
-    ; If you are seeing sculpt texture decode problems
-    ; (messages such as "Decoded image with unhandled number of components: 0 shortly followed by a physcs exception")
-    ; then you might want to try setting this to false.
     mesh_sculpted_prim = true
 
     ; number^2 non-physical level of detail of the sculpt texture.  32x32 - 1024 verticies
@@ -1476,9 +1425,6 @@
 
 
 [RemoteAdmin]
-    ;; This is the remote admin module, which uses XMLRPC requests to
-    ;; manage regions from a web interface.
-
     enabled = false
 
     ; Set this to a nonzero value to have remote admin use a different port
@@ -1694,6 +1640,11 @@
     ; It has no ill effect on viewers which do not support server-side windlight settings.
     enable_windlight = true
 
+[Materials]
+    ;# {enable_materials} {} {Enable Materials support?} {true false} true
+    ;; This enables the use of Materials.
+    enable_materials = true
+    ; MaxMaterialsPerTransaction = 50
 
 [Trees]
     ; enable the trees module. default true
@@ -1712,7 +1663,6 @@
     ; NumberOfTrees * NumberAvatars * 1000 / update_rate udp packets per second
     allowGrow = false
 
-
 [VectorRender]
     ; the font to use for rendering text (default: Arial)
     ; font_name = "Arial"
@@ -1861,19 +1811,19 @@
 
     ; Detail level when rendering prims in llCastRay V3
     ; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call
-    PrimDetailLevelInLlCastRay = 1
+    PrimDetailLevelInLlCastRay = 2
 
     ; Detail level when rendering sculpts in llCastRay V3
     ; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call
-    SculptDetailLevelInLlCastRay = 1
+    SculptDetailLevelInLlCastRay = 2
 
     ; Detail level when rendering meshes in llCastRay V3
     ; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call
-    MeshDetailLevelInLlCastRay = 3
+    MeshDetailLevelInLlCastRay = 2
 
     ; Detail level when rendering avatar capsules in llCastRay V3
     ; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call
-    AvatarDetailLevelInLlCastRay = 1
+    AvatarDetailLevelInLlCastRay = 2
 
     ; Maximum number of returned hits from llCastRay V3
     MaxHitsInLlCastRay = 16
@@ -1941,17 +1891,12 @@
 [Economy]
     ; the economy module in use
     ; default is the provided BetaGridLikeMoneyModule
-    ; - This module is for demonstration only -
     ; The default economy module only implements just enough to allow free actions (transfer of objects, etc).
     ; There is no intention to implement anything further in core OpenSimulator.
     ; This functionality has to be provided by third party modules.
-    ; To use other modules you need to override this setting on OpenSim.ini Economy (or startup) section
     ; economymodule = BetaGridLikeMoneyModule
 
-    ; These economy values get used in the BetaGridLikeMoneyModule.  - This module is for demonstration only -
-    ; The default economy module only implements just enough to allow free actions (transfer of objects, etc).
-    ; There is no intention to implement anything further in core OpenSimulator.
-    ; This functionality has to be provided by third party modules.
+    ; Economy values get used in the BetaGridLikeMoneyModule.
 
     ;; Enables selling things for $0.  Default is true.
     SellEnabled = true
@@ -1980,6 +1925,40 @@
     ;PriceObjectScaleFactor = 10
     ;PriceParcelRent = 0
 
+    ; Mesh upload settings, independent of economymodule
+
+    ; Create inventory entries for textures uploaded with a model
+    ; default is false, ie, do not create
+    MeshModelAllowTextureToInventory = true
+
+
+[YEngine]
+    ;; implements non preemptive microthreading, so fixing problems like llSleep or long events handlers
+    ;; but those will suffer from timeslicing, so will be slower.
+    ;; warning: scripts state is lost on TP or cross to Xengine regions (cars stop, etc)
+    ;; ignore its extensions (subset of original XMRengine), those are still undefined.
+    Enabled = false
+
+    ; maximum stack a script can use in KB
+    ;ScriptStackSize = 2048
+
+    ; maximum heap memory a script can use in KB
+    ;ScriptHeapSize = 1024
+
+    ; number of threads to execute script. Too many threads can have negative impact on other region operations
+    ;NumThreadScriptWorkers = 2
+
+    ; Priority of those threads (Lowest, BelowNormal, Normal, AboveNormal or Highest). Higher priorit can have negative impact on other region operations
+    ;Priority = Normal
+
+    ; to reuse binary compare sources using a hash codes of them or full text
+    UseSourceHashCode = true
+
+    MinTimerInterval = 0.1
+
+    ; scripts states and cache parent folder location
+    ;ScriptBasePath="ScriptEngines"
+
 
 [XEngine]
     ; Enable this engine in this OpenSim instance
@@ -2005,14 +1984,10 @@
 
     ; Set this to true to load each script into a separate
     ; AppDomain. Setting this to false will load all script assemblies into the
-    ; current AppDomain, which will reduce the initial per-script memory overhead,
-    ; but deleted scripts stay inactive using memory.
-    ; Significantly improving script loading times.
-    ; However, setting this to false will also prevent script DLLs from being unloaded from memory if the script is deleted.
-    ; This may cause an OutOfMemory problem over time when avatars with scripted attachments move in and out of the region.
-    ; This may only be a problem if regions stay alive for a long time with lots of scripts added or edited.
-    ; At this time some mono versions seem to have problems with the true option,
-    ; so default is now false until a fix is found, to simply life of less technical skilled users.
+    ; current AppDomain, which will reduce the per-script overhead but deleted scripts stay inactive using memory
+    ; this may only be a problem if regions stay alive for a long time with lots of scripts added or edited.
+    ; at this time some mono versions seem to have problems with the true option
+    ; so default is now false until a fix is found
     ; WARNING this makes OpenSim use four times as much memory!
     AppDomainLoading = false
 
@@ -2110,6 +2085,12 @@
     ; before aborting the thread (such as when an object containing scripts is taken into inventory).
     WaitForEventCompletionOnScriptStop = 1000
 
+    ; Sets the multiplier for the scripting delays
+    ScriptDelayFactor = 1.0
+
+    ; The factor the 10 m distances llimits are multiplied by
+    ScriptDistanceLimitFactor = 1.0
+
     ; Maximum length of notecard line read
     ; Increasing this to large values potentially opens
     ; up the system to malicious scripters.  Pfffft.
@@ -2177,51 +2158,11 @@
     ;broker = "http://broker.place.com/{1}"
 
 
-[MRM]
-    ; Enables the Mini Region Modules Script Engine.
-    ; default is false
-    Enabled = false
-
-    ; Runs MRM in a Security Sandbox
-    ; WARNING: DISABLING IS A SECURITY RISK.
-    Sandboxed = true
-
-    ; The level sandbox to use, adjust at your OWN RISK.
-    ; Valid values are:
-    ; *  FullTrust
-    ; *  SkipVerification
-    ; *  Execution
-    ; *  Nothing
-    ; *  LocalIntranet
-    ; *  Internet
-    ; *  Everything
-    SandboxLevel = "Internet"
-
-    ; Only allow Region Owners to run MRMs
-    ; May represent a security risk if you disable this.
-    OwnerOnly = true
-
-
 [Hypergrid]
     ; Keep it false for now. Making it true requires the use of a special client in order to access inventory
     safemode = false
 
 
-[FreeSwitchVoice]
-    ;; In order for this to work you need a functioning FreeSWITCH PBX set up.
-    ;; Configuration details at http://opensimulator.org/wiki/Freeswitch_Module
-    ; Enabled = false
-
-    ;; You need to load a local service for a standalone, and a remote service
-    ;; for a grid region. Use one of the lines below, as appropriate
-    ;; If you're using Freeswitch on a standalone then you will also need to configure the [FreeswitchService] section in config-include/StandaloneCommon.ini
-    ; LocalServiceModule = OpenSim.Services.FreeswitchService.dll:FreeswitchService
-    ; LocalServiceModule = OpenSim.Services.Connectors.dll:RemoteFreeswitchConnector
-
-    ;; If using a remote connector, specify the server URL
-    ; FreeswitchServiceURL = http://my.grid.server:8004/fsapi
-
-
 [VivoxVoice]
     ; The VivoxVoice module will allow you to provide voice on your
     ; region(s). It uses the same voice technology as the LL grid and
@@ -2283,10 +2224,7 @@
 
 [Groups]
     Enabled = true
-    ;# {Module} {Enabled:true} {Groups module to use? (Use GroupsModule to use Flotsam/Simian)} {Default "Groups Module V2"} Default
-    ;; The default module can use a PHP XmlRpc server from the Flotsam project at
-    ;; http://code.google.com/p/flotsam/
-    ;; or from the SimianGrid project at http://code.google.com/p/openmetaverse
+
     ; This is the current groups stub in Region.CoreModules.Avatar.Groups.  All the other settings below only really
     ; apply to the Flotsam/SimianGrid GroupsModule
     ; Module = Default
@@ -2392,16 +2330,19 @@
 
 [InterestManagement]
     ; This section controls how state updates are prioritized for each client
-    ; Valid values are BestAvatarResponsiveness, Time, Distance,
-    ; SimpleAngularDistance, and FrontBack
+
+    ; UpdatePrioritizationScheme valid values are BestAvatarResponsiveness and SimpleAngularDistance
+    ; SimpleAngularDistance does use more cpu
     UpdatePrioritizationScheme = BestAvatarResponsiveness
     ReprioritizationEnabled = true
     ReprioritizationInterval = 2000.0
     RootReprioritizationDistance = 10.0
     ChildReprioritizationDistance = 20.0
 
-    ; TEST OPTION KEEP AS FALSE
-    ; if true, don't send object updates if outside view range
+    ; ObjectsCullingByDistance, if true, don't send object updates if outside view range
+    ; currently viewers are also told to delete objects that leave view range
+    ; only avater position is considered, free camera may not see objects
+    ; does increase cpu load
     ObjectsCullingByDistance = false
 
     ; If n > 1, only every n UDP terse updates will be sent to observers of an avatar that are in the same region
@@ -2422,7 +2363,6 @@
     ; Send an update to clients if the difference from the last sent avatar velocity is greater than this tolerance
     RootVelocityUpdateTolerance = 0.001
 
-
 [Monitoring]
     ; Enable region monitoring
     ; If true, this will print out an error if more than a minute has passed since the last simulator frame
@@ -2491,7 +2431,17 @@
     ; set this to false to not display parcel ban lines
     ShowParcelBansLines = true
 
+    ; Parcel Bans max height above ground. Default 100m
+    ; range 20m to 5000m
+    BanLineSafeHeight = 5000
+
+    ; setting the parcel to admin content, It works as setting the land to Linden content in SL.
+    ; To use it, activate god mode in the viewer, select the parcel and go to: Admin -> Parcel -> Set to Linden Content ( CTRL+ALT+SHIFT+C)
+    ; DefaultAdministratorParcelName = "Admin Parcel"
+    ; DefaultAdministratorGroupUUID = "00000000-0000-0000-0000-000000000000"
+    ; DefaultAdministratorOwnerUUID = "00000000-0000-0000-0000-000000000000"
 
+;;
 ;; If you are using a simian grid frontend you can enable
 ;; this module to upload tile images for the mapping fn
 ;;
@@ -2511,6 +2461,31 @@
     EnableObjectStore = true
     MaxStringSpace = 0
 
+[UserProfiles]
+  ;# {ProfileServiceURL} {} {Set url to UserProfilesService} {}
+  ;; Set the value of the url to your UserProfilesService
+  ;; If un-set / "" the module is disabled
+  ;; ProfileServiceURL = ${Const|BaseURL}:${Const|PublicPort}
+
+  ;# {AllowUserProfileWebURLs} {} {allow user profiles web urls} {true false} true
+  ;; set this to false to prevent your users to be sent to unknown
+  ;; web sites by other users on their profiles
+  ; AllowUserProfileWebURLs = true
+
+[XBakes]
+  ;# {URL} {} {Set URL for Baked texture service} {}
+  ;; Sets the URL for the baked texture ROBUST service.
+  ;; Disabled when unset.
+  ;; URL = ${Const|BaseURL}:${Const|PrivatePort}
+
+;;
+;; Optional module to highlight God names in the viewer.
+;; Uncomment and customize appropriately if you want this behavior.
+;;
+;[GodNames]
+;    Enabled = false
+;    FullNames = "Test User, Foo Bar"
+;    Surnames = "Kryztlsk"
 
 ;;
 ;; These are defaults that are overwritten below in [Architecture].
@@ -2548,32 +2523,14 @@
     ;; Default time interval (in ms) for the throttle service thread to wake up
     Interval = 5000
 
-
 [Dwell]
     ;; This enables the built in basic dwell module
     DwellModule = DefaultDwellModule
 
+[ServerReleaseNotes]
+    ;; Comment or set to "" to disable
+    ServerReleaseNotesURL = "http://opensimulator.org/wiki/0.9.1.1_Release"
 
 [Modules]
     Include-modules = "addon-modules/*/config/*.ini"
 
-
-[Materials]
-    ;; This enables the use of Materials.
-     enable_materials = true
-     MaxMaterialsPerTransaction = 50
-
-
-[XBakes]
-  ;; Sets the URL for the baked texture ROBUST service.
-  ;; Disabled when unset.
-   URL = ${Const|BaseURL}:${Const|PrivatePort}
-
-
-;; Optional module to highlight God names in the viewer.
-;; Uncomment and customize appropriately if you want this behavior.
-;;
-;[GodNames]
-;       Enabled = false
-;       FullNames = "Test User, Foo Bar"
-;       Surnames = "Kryztlsk"