Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

5 files changed, 38 insertions, 23 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index f5268bd..d395efe 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -610,17 +610,16 @@
 [SimulatorFeatures]
 
     ;# {SearchServerURI} {} {URL of the search server} {}
-    ;; This is identical to the Robust LoginService SearchURL setting
-    ;; and will override that value if set here. The Robust setting
-    ;; provides a working default for the grid and setting here is 
-    ;; optional.
+    ;; Optional. If given this serves the same purpose as the grid wide
+    ;; [LoginServices] SearchURL setting and will override that where
+    ;; supported by viewers.
     ;SearchServerURI = "http://127.0.0.1:9000/"
+
     ;# {DestinationGuideURI} {} {URL of the destination guide} {}
-    ;;
-    ;; This serves the same purpose as the DestinationGuideURI in the
-    ;; LoginService setting in the Robust server. This will override 
-    ;; the Robust setting if desired as an option.
-    ;DestinationGuideURI = "http://127.0.0.1:9000/"
+    ;; Optional. If given this serves the same purpose as the grid wide
+    ;; [LoginServices] DestinationGuide setting and will override that where
+    ;; supported by viewers.
+    ;DestinationGuideURI = "http://127.0.0.1:9000/guide"
 
 
 [Chat]
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 636069d..9002650 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -166,12 +166,30 @@
     ; into a restart.
     InworldRestartShutsDown = false
 
+    ; Use of normalized 55FPS statistics
+        ; Opensim does not have a frame rate control like other simulators
+        ; Most parameters that control timing can be configurable region by region
+        ; To achive closer compatibility with values expected by viewers, scripts and users
+        ; some parameters are converted to a equivalent per frame value.
+        ; Adicionaly they are scaled to values they whould have on a system running at a nominal 55 frames per second rate
+        ; The scale factor it 55 * FrameTime, corresponding to 5 with default configuration
+        ; You can choose to not apply this scale factor setting Normalized55FPS to false.
+        ; Normalized55FPS = true
+        
     ; The minimum proportion of a second that any particular frame can take to execute.
     ; Only change this if you really know what you're doing, and be prepared to change UpdatePhysicsEveryNFrames
     ; (and other Frames params) to match!  For instance, halving MinFrameTime to 0.0445 require
     ; UpdatePhysicsEveryNFrames = 2 unless you don't mind your avatar walking like Benny Hill.
     MinFrameTime = 0.089
 
+    ; The values below represent the percentage of the target frame time that,
+    ; when underrun, should trigger yellow or red in the lag meter.
+    ; Less than 60% of FPS is amber by default, less then 40% is red.
+    ; These values are advisory. Viewers may choose to not use them but it is
+    ; encouraged that they do.
+    ; FrameTimeWarnPercent = 60;
+    ; FrameTimeCritPercent = 40;
+        
     ; Send scheduled updates to objects in the scene
     ; This must be a whole number
     UpdateObjectsEveryNFrames = 1;
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 82eaf1f..6af444c 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -551,12 +551,12 @@
     ;                       this as splash page
     ;welcome = ${Const|BaseURL}/welcome
 
-    ; helper uri: optional: if it exists if will be used to tell the client to use
+    ; helper uri: optional: if it exists it will be used to tell the client to use
     ;                       this for all economy related things
-    ;economy = ${Const|BaseURL}:${Const|PublicPort}/
+    ;economy = ${Const|BaseURL}/economy
 
     ; web page of grid: optional: page providing further information about your grid
-    ;about = ${Const|BaseURL}/about/
+    ;about = ${Const|BaseURL}/about
 
     ; account creation: optional: page providing further information about obtaining
     ;                             a user account on your grid
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 8d6496d..099d4da 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -538,12 +538,12 @@
     ;                       this as splash page
     ;welcome = ${Const|BaseURL}/welcome
 
-    ; helper uri: optional: if it exists if will be used to tell the client to use
+    ; helper uri: optional: if it exists it will be used to tell the client to use
     ;                       this for all economy related things
-    ;economy = ${Const|BaseURL}:${Const|PublicPort}/
+    ;economy = ${Const|BaseURL}/economy
 
     ; web page of grid: optional: page providing further information about your grid
-    ;about = ${Const|BaseURL}/about/
+    ;about = ${Const|BaseURL}/about
 
     ; account creation: optional: page providing further information about obtaining
     ;                             a user account on your grid
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 76d7a99..d0b152c 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -134,6 +134,9 @@
     ; Url to search service
     ; SearchURL = "${Const|BaseURL}:${Const|PublicPort}";
 
+    ; For V3 destination guide
+    ; DestinationGuide = "${Const|BaseURL}/guide"
+
     ; The minimum user level required for a user to be able to login.  0 by default
     ; If you disable a particular user's account then you can set their login level below this number.
     ; You can also change this level from the console though these changes will not be persisted.
@@ -222,26 +225,21 @@
     ; information on a standalone
     ;welcome = ${Const|BaseURL}/welcome
 
-    ; helper uri: optional: if it exists if will be used to tell the client to use
+    ; helper uri: optional: if it exists it will be used to tell the client to use
     ;                       this for all economy related things
-    ; currently unused
-    ;economy = ${Const|BaseURL}:${Const|PublicPort}/
+    ;economy = ${Const|BaseURL}/economy
 
     ; web page of grid: optional: page providing further information about your grid
-    ; currently unused
-    ;about = ${Const|BaseURL}/about/
+    ;about = ${Const|BaseURL}/about
 
     ; account creation: optional: page providing further information about obtaining
     ;                             a user account on your grid
-    ; currently unused
     ;register = ${Const|BaseURL}/register
 
     ; help: optional: page providing further assistance for users of your grid
-    ; currently unused
     ;help = ${Const|BaseURL}/help
 
     ; password help: optional: page providing password assistance for users of your grid
-    ; currently unused
     ;password = ${Const|BaseURL}/password
 
     ; HG address of the gatekeeper, if you have one