diff options
| author | Melanie | 2012-10-16 04:30:01 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-16 04:30:01 +0100 |
| commit | fa52effb279355ef731725c04c3b659f972f3903 (patch) | |
| tree | 7d9029b0ded43814206112d5e5b2115b9b463fc7 /OpenSim/Region/ClientStack/Linden/Caps/EventQueue | |
| parent | Fix a merge issue (diff) | |
| parent | minor: Comment out log message on every FRIENDS SIM CONNECTOR request for now. (diff) | |
| download | opensim-SC-fa52effb279355ef731725c04c3b659f972f3903.zip opensim-SC-fa52effb279355ef731725c04c3b659f972f3903.tar.gz opensim-SC-fa52effb279355ef731725c04c3b659f972f3903.tar.bz2 opensim-SC-fa52effb279355ef731725c04c3b659f972f3903.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/EventQueue')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index 132546b..5bbdce8 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |||
| @@ -111,10 +111,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 111 | false, | 111 | false, |
| 112 | "debug eq", | 112 | "debug eq", |
| 113 | "debug eq [0|1|2]", | 113 | "debug eq [0|1|2]", |
| 114 | "Turn on event queue debugging" | 114 | "Turn on event queue debugging\n" |
| 115 | + "<= 0 - turns off all event queue logging" | 115 | + " <= 0 - turns off all event queue logging\n" |
| 116 | + ">= 1 - turns on outgoing event logging" | 116 | + " >= 1 - turns on outgoing event logging\n" |
| 117 | + ">= 2 - turns on poll notification", | 117 | + " >= 2 - turns on poll notification", |
| 118 | HandleDebugEq); | 118 | HandleDebugEq); |
| 119 | } | 119 | } |
| 120 | else | 120 | else |