diff options
author | Diva Canto | 2013-08-09 08:31:30 -0700 |
---|---|---|
committer | Diva Canto | 2013-08-09 08:31:30 -0700 |
commit | 2cdcf62b48fde64d1ad11a4db46afeddff1a0770 (patch) | |
tree | 76d2f53def5e6cd05b9b9e5f3e3e1e759c29e87e /bin | |
parent | Go easy on enforcing session ids in position updates (diff) | |
parent | BulletSim: adjust avatar position when the avatar's size is changed. (diff) | |
download | opensim-SC_OLD-2cdcf62b48fde64d1ad11a4db46afeddff1a0770.zip opensim-SC_OLD-2cdcf62b48fde64d1ad11a4db46afeddff1a0770.tar.gz opensim-SC_OLD-2cdcf62b48fde64d1ad11a4db46afeddff1a0770.tar.bz2 opensim-SC_OLD-2cdcf62b48fde64d1ad11a4db46afeddff1a0770.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSimDefaults.ini | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index d5d29ec..0a85085 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -264,8 +264,15 @@ | |||
264 | 264 | ||
265 | ; Simulator Stats URI | 265 | ; Simulator Stats URI |
266 | ; Enable JSON simulator data by setting a URI name (case sensitive) | 266 | ; Enable JSON simulator data by setting a URI name (case sensitive) |
267 | ; Returns regular sim stats (SimFPS, ...) | ||
267 | ; Stats_URI = "jsonSimStats" | 268 | ; Stats_URI = "jsonSimStats" |
268 | 269 | ||
270 | ; Simulator StatsManager URI | ||
271 | ; Enable fetch of StatsManager registered stats. Fetch is query which can optionally | ||
272 | ; specify category, container and stat to fetch. If not selected, returns all of that type. | ||
273 | ; http://simulatorHTTPport/ManagedStats/?cat=Category&cont=Container&stat=Statistic | ||
274 | ; ManagedStatsRemoteFetchURI = "ManagedStats" | ||
275 | |||
269 | ; Make OpenSim start all regions woth logins disabled. They will need | 276 | ; Make OpenSim start all regions woth logins disabled. They will need |
270 | ; to be enabled from the console if this is set | 277 | ; to be enabled from the console if this is set |
271 | ; StartDisabled = false | 278 | ; StartDisabled = false |