Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
author: Melanie 2013-01-11 02:13:10 +0000
committer: Melanie 2013-01-11 02:13:10 +0000
commit: f74915ed4f8831344ee588d9036b7ac866ea4294 (patch)
tree: 5f1021165cf4acc9043b3015c2aac468128fa1dc /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups
parent: Merge branch 'master' into careminster (diff)
parent: Fix a regression in the last few scene commands changes where setting these v... (diff)
download: opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.zip
opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.gz
opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.bz2
opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index ae0ad02..d764936 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
            {
                scene.RegisterModuleInterface<IGroupsModule>(this);
                scene.AddCommand(
-                    "debug",
+                    "Debug",
                    this,
                    "debug groups verbose",
                    "debug groups verbose <true|false>",
author	Melanie	2013-01-11 02:13:10 +0000
committer	Melanie	2013-01-11 02:13:10 +0000
commit	f74915ed4f8831344ee588d9036b7ac866ea4294 (patch)
tree	5f1021165cf4acc9043b3015c2aac468128fa1dc /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups
parent	Merge branch 'master' into careminster (diff)
parent	Fix a regression in the last few scene commands changes where setting these v... (diff)
download	opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.zip opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.gz opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.bz2 opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index ae0ad02..d764936 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
126	{	126	{
127	scene.RegisterModuleInterface<IGroupsModule>(this);	127	scene.RegisterModuleInterface<IGroupsModule>(this);
128	scene.AddCommand(	128	scene.AddCommand(
129	"debug",	129	"Debug",
130	this,	130	this,
131	"debug groups verbose",	131	"debug groups verbose",
132	"debug groups verbose <true\|false>",	132	"debug groups verbose <true\|false>",