From c9695a0a59cba91a184683efaa7802338d68e4bd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 2 Aug 2013 00:00:00 +0100
Subject: Move experimental attachments throttling further down the chain so
that multiple attachments changes (e.g. change outfit) are also throttled
---
bin/OpenSimDefaults.ini | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'bin')
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 2488bf1..d5d29ec 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -710,8 +710,8 @@
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
- ; or when multiple avatars with medium level attachments login simultaneously.
+ ; 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;
--
cgit v1.1
From 54b1071556edf264835f990bb3595064d2b2e2f0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 2 Aug 2013 23:12:54 +0100
Subject: Allow older teleport ConnectorProtocolVersion of "SIMULATION/0.1" to
be manually forced in a new [SimulationService] config setting.
This is for testing and debugging purposes to help determine whether a particular issue may be teleport related or not
"SIMULATION/0.2" (the newer teleport protocol) remains the default. If the source simulator only implements "SIMULATION/0.1" this will correctly allow fallback to the older protocol.
Specifying "SIMULATION/0.1" will force the older, less efficient protocol to always be used.
---
bin/config-include/Grid.ini | 11 +++++++++++
bin/config-include/Standalone.ini | 11 +++++++++++
2 files changed, 22 insertions(+)
(limited to 'bin')
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 15ba55a..1837bdd 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -30,6 +30,17 @@
SimulationServiceInConnector = true
LibraryModule = true
+[SimulationService]
+ ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
+ ; It is used to control the teleport handoff process.
+ ; Valid values are
+ ; "SIMULATION/0.2"
+ ; - this is the default. A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
+ ; - this protocol is more efficient than "SIMULATION/0.1"
+ ; "SIMULATION/0.1"
+ ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
+ ConnectorProtocolVersion = "SIMULATION/0.2"
+
[SimulationDataStore]
LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index d3b9cb4..7b7beb2 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -26,6 +26,17 @@
GridInfoServiceInConnector = true
MapImageServiceInConnector = true
+[SimulationService]
+ ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
+ ; It is used to control the teleport handoff process.
+ ; Valid values are
+ ; "SIMULATION/0.2"
+ ; - this is the default. A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
+ ; - this protocol is more efficient than "SIMULATION/0.1"
+ ; "SIMULATION/0.1"
+ ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
+ ConnectorProtocolVersion = "SIMULATION/0.2"
+
[SimulationDataStore]
LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
--
cgit v1.1
From 4c2f6de8e4957df3c7186437089ba0925edb1a08 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 6 Aug 2013 18:29:33 +0100
Subject: Add the experimental ability to dump stats (result of command "show
stats all") to file OpenSimStats.log every 5 seconds.
This can currently only be activated with the console command "debug stats record start".
Off by default.
Records to file OpenSimStats.log for simulator and RobustStats.log for ROBUST
---
bin/OpenSim.32BitLaunch.exe.config | 36 +++++++++++++++++++++++++++++++++++-
bin/OpenSim.exe.config | 21 +++++++++++++++++++++
bin/Robust.32BitLaunch.exe.config | 22 ++++++++++++++++++++++
bin/Robust.exe.config | 21 +++++++++++++++++++++
4 files changed, 99 insertions(+), 1 deletion(-)
(limited to 'bin')
diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config
index 6ac0206..6a6b3c8 100644
--- a/bin/OpenSim.32BitLaunch.exe.config
+++ b/bin/OpenSim.32BitLaunch.exe.config
@@ -11,22 +11,56 @@
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index 8a891f4..b2cb4e5 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -11,6 +11,10 @@
+
+
+
+
@@ -21,11 +25,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -42,5 +58,10 @@
+
+
+
+
+
diff --git a/bin/Robust.32BitLaunch.exe.config b/bin/Robust.32BitLaunch.exe.config
index dae45ff..ec17049 100644
--- a/bin/Robust.32BitLaunch.exe.config
+++ b/bin/Robust.32BitLaunch.exe.config
@@ -11,22 +11,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config
index 4914f55..62975fd 100644
--- a/bin/Robust.exe.config
+++ b/bin/Robust.exe.config
@@ -11,6 +11,10 @@
+
+
+
+
@@ -19,15 +23,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
cgit v1.1
From dbd773e89e1956144d0358033e560fbd36c89ecd Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 7 Aug 2013 10:04:53 -0700
Subject: Amend to last commit -- remove the obsolete var from
OpenSim.ini.example
---
bin/OpenSim.ini.example | 4 ----
1 file changed, 4 deletions(-)
(limited to 'bin')
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 33f3263..d6de777 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -184,10 +184,6 @@
;; if the first change occurred this number of seconds ago.
; MaximumTimeBeforePersistenceConsidered = 600
- ;# {see_into_this_sim_from_neighbor} {} {Should avatars in neighbor sims see objects in this sim?} {true false} true
- ;; Should avatars in neighbor sims see objects in this sim?
- ; see_into_this_sim_from_neighbor = true
-
;# {physical_prim} {} {Allow prims to be physical?} {true false} true
;; if you would like to allow prims to be physical and move by physics
;; with the physical checkbox in the client set this to true.
--
cgit v1.1