diff options
| author | Dr Scofield | 2009-03-12 18:51:28 +0000 |
|---|---|---|
| committer | Dr Scofield | 2009-03-12 18:51:28 +0000 |
| commit | fa619bdf8c2e7d935f662a2f9d289c78ce618192 (patch) | |
| tree | 0d72600377766468b1ca654a25f4bdee65c27b55 /bin | |
| parent | * Move SceneObject tests into their proper namespace (diff) | |
| download | opensim-SC-fa619bdf8c2e7d935f662a2f9d289c78ce618192.zip opensim-SC-fa619bdf8c2e7d935f662a2f9d289c78ce618192.tar.gz opensim-SC-fa619bdf8c2e7d935f662a2f9d289c78ce618192.tar.bz2 opensim-SC-fa619bdf8c2e7d935f662a2f9d289c78ce618192.tar.xz | |
From: Christopher Yeoh <yeohc@au1.ibm.com>
Patch to RegionReady which adds a field which adds to the message
whether the region is ready due to a server startup or due to an oar
file loading.
Diffstat (limited to '')
| -rw-r--r-- | bin/OpenSim.ini.example | 11 | ||||
| -rw-r--r-- | bin/config.preview.donotuseyet/region/scripting/regionready.ini.example | 7 |
2 files changed, 10 insertions, 8 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index ef72dc4..e2ae33c 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -1100,11 +1100,12 @@ InterregionComms = "RESTComms" | |||
| 1100 | ; default is false | 1100 | ; default is false |
| 1101 | enabled = false | 1101 | enabled = false |
| 1102 | 1102 | ||
| 1103 | ; Channel on which to signal region readiness through a message | 1103 | ; Channel on which to signal region readiness through a message |
| 1104 | ; formatted as follows: "{0|1},n,[oar error]" | 1104 | ; formatted as follows: "{server_startup|oar_file_load},{0|1},n,[oar error]" |
| 1105 | ; - the first number indicating whether the OAR file loaded ok (1 == ok, 0 == error) | 1105 | ; - the first field indicating whether this is an initial server startup |
| 1106 | ; - the second number indicates how many scrips failed to compile | 1106 | ; - the second field is a number indicating whether the OAR file loaded ok (1 == ok, 0 == error) |
| 1107 | ; - "oar error" if supplied, provides the error message from the OAR load | 1107 | ; - the third field is a number indicating how many scripts failed to compile |
| 1108 | ; - "oar error" if supplied, provides the error message from the OAR load | ||
| 1108 | channel_notify = -800 | 1109 | channel_notify = -800 |
| 1109 | 1110 | ||
| 1110 | 1111 | ||
diff --git a/bin/config.preview.donotuseyet/region/scripting/regionready.ini.example b/bin/config.preview.donotuseyet/region/scripting/regionready.ini.example index 611b81b..e64139e 100644 --- a/bin/config.preview.donotuseyet/region/scripting/regionready.ini.example +++ b/bin/config.preview.donotuseyet/region/scripting/regionready.ini.example | |||
| @@ -12,8 +12,9 @@ | |||
| 12 | enabled = false | 12 | enabled = false |
| 13 | 13 | ||
| 14 | ; Channel on which to signal region readiness through a message | 14 | ; Channel on which to signal region readiness through a message |
| 15 | ; formatted as follows: "{0|1},n,[oar error]" | 15 | ; formatted as follows: "{server_startup|oar_file_load},{0|1},n,[oar error]" |
| 16 | ; - the first number indicating whether the OAR file loaded ok (1 == ok, 0 == error) | 16 | ; - the first field indicating whether this is an initial server startup |
| 17 | ; - the second number indicates how many scrips failed to compile | 17 | ; - the second field is a number indicating whether the OAR file loaded ok (1 == ok, 0 == error) |
| 18 | ; - the third field is a number indicating how many scripts failed to compile | ||
| 18 | ; - "oar error" if supplied, provides the error message from the OAR load | 19 | ; - "oar error" if supplied, provides the error message from the OAR load |
| 19 | channel_notify = -800 | 20 | channel_notify = -800 |