aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2012-03-08 19:10:22 +0000
committerMelanie2012-03-08 19:10:22 +0000
commitb0fc96c17d818ab7a57d7d84e26ca8138b3985a4 (patch)
treea50cda2fed5359b83e63ed3df41bdc3a8b7198d7 /OpenSim/Region/ClientStack
parentMerge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parentMove "change region" command into general category (diff)
downloadopensim-SC_OLD-b0fc96c17d818ab7a57d7d84e26ca8138b3985a4.zip
opensim-SC_OLD-b0fc96c17d818ab7a57d7d84e26ca8138b3985a4.tar.gz
opensim-SC_OLD-b0fc96c17d818ab7a57d7d84e26ca8138b3985a4.tar.bz2
opensim-SC_OLD-b0fc96c17d818ab7a57d7d84e26ca8138b3985a4.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 8ba6f61..7c07c56 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Region.ClientStack.Linden
106 scene.EventManager.OnRegisterCaps += OnRegisterCaps; 106 scene.EventManager.OnRegisterCaps += OnRegisterCaps;
107 107
108 MainConsole.Instance.Commands.AddCommand( 108 MainConsole.Instance.Commands.AddCommand(
109 "event queue", 109 "Comms",
110 false, 110 false,
111 "debug eq", 111 "debug eq",
112 "debug eq [0|1]", 112 "debug eq [0|1]",