Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Dan Lake 2012-03-27 12:51:58 -0700
committer: Dan Lake 2012-03-27 12:51:58 -0700
commit: 971d32fda3cf8384987a6709cd2242afecce13ab (patch)
tree: 2607c27fad429ff0036fe7b7d275ddf717397282 /OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
parent: When loading objects from DB, first add to scene, then call TriggerOnSceneObj... (diff)
parent: HG: beginning of a more restrictive inventory access procedure (optional). Ex... (diff)
download: opensim-SC-971d32fda3cf8384987a6709cd2242afecce13ab.zip
opensim-SC-971d32fda3cf8384987a6709cd2242afecce13ab.tar.gz
opensim-SC-971d32fda3cf8384987a6709cd2242afecce13ab.tar.bz2
opensim-SC-971d32fda3cf8384987a6709cd2242afecce13ab.tar.xz
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
                scene.EventManager.OnRegisterCaps += OnRegisterCaps;
                MainConsole.Instance.Commands.AddCommand(
-                    "event queue",
+                    "Comms",
                    false,
                    "debug eq",
                    "debug eq [0|1]",
author	Dan Lake	2012-03-27 12:51:58 -0700
committer	Dan Lake	2012-03-27 12:51:58 -0700
commit	971d32fda3cf8384987a6709cd2242afecce13ab (patch)
tree	2607c27fad429ff0036fe7b7d275ddf717397282 /OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
parent	When loading objects from DB, first add to scene, then call TriggerOnSceneObj... (diff)
parent	HG: beginning of a more restrictive inventory access procedure (optional). Ex... (diff)
download	opensim-SC-971d32fda3cf8384987a6709cd2242afecce13ab.zip opensim-SC-971d32fda3cf8384987a6709cd2242afecce13ab.tar.gz opensim-SC-971d32fda3cf8384987a6709cd2242afecce13ab.tar.bz2 opensim-SC-971d32fda3cf8384987a6709cd2242afecce13ab.tar.xz

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]",