aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie2010-12-17 22:50:25 +0000
committerMelanie2010-12-17 22:50:25 +0000
commita82112a47cc9285629fd11c5e75586532c26aef0 (patch)
tree48e2de146a91f31973578a6706188bf2d6477a11 /OpenSim/Region/Application
parentFix notecards that end with an embedded object causing an exception (diff)
parentFix notecards that end with an embedded object causing an exception (diff)
downloadopensim-SC_OLD-a82112a47cc9285629fd11c5e75586532c26aef0.zip
opensim-SC_OLD-a82112a47cc9285629fd11c5e75586532c26aef0.tar.gz
opensim-SC_OLD-a82112a47cc9285629fd11c5e75586532c26aef0.tar.bz2
opensim-SC_OLD-a82112a47cc9285629fd11c5e75586532c26aef0.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 300d8a6..7a188fd 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -220,10 +220,11 @@ namespace OpenSim
220 m_console.Commands.AddCommand("region", false, "debug packet", 220 m_console.Commands.AddCommand("region", false, "debug packet",
221 "debug packet <level>", 221 "debug packet <level>",
222 "Turn on packet debugging", 222 "Turn on packet debugging",
223 "If level > 255 then all incoming and outgoing packets are logged.\n" 223 "If level > 255 then all incoming and outgoing packets are logged.\n"
224 + "If level <= 255 then incoming AgentUpdate and outgoing SimStats and SimulatorViewerTimeMessage packets are not logged.\n" 224 + "If level <= 255 then incoming AgentUpdate and outgoing SimStats and SimulatorViewerTimeMessage packets are not logged.\n"
225 + "If level <= 200 then incoming RequestImage and outgoing ImagePacket, ImageData, LayerData and CoarseLocationUpdate packets are not logged.\n" 225 + "If level <= 200 then incoming RequestImage and outgoing ImagePacket, ImageData, LayerData and CoarseLocationUpdate packets are not logged.\n"
226 + "If level <= 100 then incoming ViewerEffect and AgentAnimation and outgoing ViewerEffect and AvatarAnimation packets are not logged.\n" 226 + "If level <= 100 then incoming ViewerEffect and AgentAnimation and outgoing ViewerEffect and AvatarAnimation packets are not logged.\n"
227 + "If level <= 50 then outgoing ImprovedTerseObjectUpdate packets are not logged.\n"
227 + "If level <= 0 then no packets are logged.", 228 + "If level <= 0 then no packets are logged.",
228 Debug); 229 Debug);
229 230