diff options
| author | Michael Heilmann | 2015-05-19 14:40:49 -0400 |
|---|---|---|
| committer | Michael Heilmann | 2015-05-19 14:40:49 -0400 |
| commit | 714c082ca856a18292cee345d2b875006c41a6d5 (patch) | |
| tree | fdade1a62aabdf4138f6cbbcbf03bdc9be2ca3c2 /bin | |
| parent | Merge pull request #5 from gamucf/moses.metricsPhase1 (diff) | |
| parent | Merge branch 'master' of https://github.com/M-O-S-E-S/opensim into moses.metr... (diff) | |
| download | opensim-SC_OLD-714c082ca856a18292cee345d2b875006c41a6d5.zip opensim-SC_OLD-714c082ca856a18292cee345d2b875006c41a6d5.tar.gz opensim-SC_OLD-714c082ca856a18292cee345d2b875006c41a6d5.tar.bz2 opensim-SC_OLD-714c082ca856a18292cee345d2b875006c41a6d5.tar.xz | |
Merge pull request #7 from gamucf/moses.metricsPhase2
Moses.metrics phase2
Diffstat (limited to 'bin')
| -rwxr-xr-x[-rw-r--r--] | bin/LukeSkywalker.IPNetwork.dll | bin | 18432 -> 18432 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | bin/OpenSimDefaults.ini | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/bin/LukeSkywalker.IPNetwork.dll b/bin/LukeSkywalker.IPNetwork.dll index 25bcc2f..25bcc2f 100644..100755 --- a/bin/LukeSkywalker.IPNetwork.dll +++ b/bin/LukeSkywalker.IPNetwork.dll | |||
| Binary files differ | |||
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index af37ccc..3422996 100644..100755 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -296,7 +296,7 @@ | |||
| 296 | ; Simulator Stats URI | 296 | ; Simulator Stats URI |
| 297 | ; Enable JSON simulator data by setting a URI name (case sensitive) | 297 | ; Enable JSON simulator data by setting a URI name (case sensitive) |
| 298 | ; Returns regular sim stats (SimFPS, ...) | 298 | ; Returns regular sim stats (SimFPS, ...) |
| 299 | ; Stats_URI = "jsonSimStats" | 299 | Stats_URI = "jsonSimStats" |
| 300 | 300 | ||
| 301 | ; Simulator StatsManager URI | 301 | ; Simulator StatsManager URI |
| 302 | ; Enable fetch of StatsManager registered stats. Fetch is query which can optionally | 302 | ; Enable fetch of StatsManager registered stats. Fetch is query which can optionally |