aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-10-24 01:33:21 +0100
committerJustin Clark-Casey (justincc)2012-10-24 01:33:21 +0100
commit938fa96b9f5377ef330171232262b4d8aaca0918 (patch)
treeead5f8baa7ea38b3da3f18f4aa6aa2d5dc6a784d /OpenSim
parentMake it possible to turn the base UDP object packet pools on and off whilst r... (diff)
downloadopensim-SC_OLD-938fa96b9f5377ef330171232262b4d8aaca0918.zip
opensim-SC_OLD-938fa96b9f5377ef330171232262b4d8aaca0918.tar.gz
opensim-SC_OLD-938fa96b9f5377ef330171232262b4d8aaca0918.tar.bz2
opensim-SC_OLD-938fa96b9f5377ef330171232262b4d8aaca0918.tar.xz
minor: Move co-ordinate related help to object commands to common ConsoleUtil.CoordHelp
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Console/ConsoleUtil.cs17
-rw-r--r--OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs36
2 files changed, 20 insertions, 33 deletions
diff --git a/OpenSim/Framework/Console/ConsoleUtil.cs b/OpenSim/Framework/Console/ConsoleUtil.cs
index a7cf0c0..027753d 100644
--- a/OpenSim/Framework/Console/ConsoleUtil.cs
+++ b/OpenSim/Framework/Console/ConsoleUtil.cs
@@ -36,6 +36,23 @@ public class ConsoleUtil
36{ 36{
37// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 37// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38 38
39 /// <summary>
40 /// Used by modules to display stock co-ordinate help, though possibly this should be under some general section
41 /// rather than in each help summary.
42 /// </summary>
43 public const string CoordHelp
44= @"Each component of the coord is comma separated. There must be no spaces between the commas.
45If you don't care about the z component you can simply omit it.
46If you don't care about the x or y components then you can leave them blank (though a comma is still required)
47If you want to specify the maxmimum value of a component then you can use ~ instead of a number
48If you want to specify the minimum value of a component then you can use -~ instead of a number
49e.g.
50delete object pos 20,20,20 to 40,40,40
51delete object pos 20,20 to 40,40
52delete object pos ,20,20 to ,40,40
53delete object pos ,,30 to ,,~
54delete object pos ,,-~ to ,,30";
55
39 public const string MinRawConsoleVectorValue = "-~"; 56 public const string MinRawConsoleVectorValue = "-~";
40 public const string MaxRawConsoleVectorValue = "~"; 57 public const string MaxRawConsoleVectorValue = "~";
41 58
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index 87241e1..6435ae6 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -122,17 +122,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
122 "delete object pos", 122 "delete object pos",
123 "delete object pos <start-coord> to <end-coord>", 123 "delete object pos <start-coord> to <end-coord>",
124 "Delete scene objects within the given area.", 124 "Delete scene objects within the given area.",
125 "Each component of the coord is comma separated. There must be no spaces between the commas.\n" 125 ConsoleUtil.CoordHelp,
126 + "If you don't care about the z component you can simply omit it.\n"
127 + "If you don't care about the x or y components then you can leave them blank (though a comma is still required)\n"
128 + "If you want to specify the maxmimum value of a component then you can use ~ instead of a number\n"
129 + "If you want to specify the minimum value of a component then you can use -~ instead of a number\n"
130 + "e.g.\n"
131 + "delete object pos 20,20,20 to 40,40,40\n"
132 + "delete object pos 20,20 to 40,40\n"
133 + "delete object pos ,20,20 to ,40,40\n"
134 + "delete object pos ,,30 to ,,~\n"
135 + "delete object pos ,,-~ to ,,30",
136 HandleDeleteObject); 126 HandleDeleteObject);
137 127
138 m_console.Commands.AddCommand( 128 m_console.Commands.AddCommand(
@@ -164,17 +154,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
164 "Show details of scene objects within the given area.", 154 "Show details of scene objects within the given area.",
165 "The --full option will print out information on all the parts of the object.\n" 155 "The --full option will print out information on all the parts of the object.\n"
166 + "For yet more detailed part information, use the \"show part\" commands.\n" 156 + "For yet more detailed part information, use the \"show part\" commands.\n"
167 + "Each component of the coord is comma separated. There must be no spaces between the commas.\n" 157 + ConsoleUtil.CoordHelp,
168 + "If you don't care about the z component you can simply omit it.\n"
169 + "If you don't care about the x or y components then you can leave them blank (though a comma is still required)\n"
170 + "If you want to specify the maxmimum value of a component then you can use ~ instead of a number\n"
171 + "If you want to specify the minimum value of a component then you can use -~ instead of a number\n"
172 + "e.g.\n"
173 + "show object pos 20,20,20 to 40,40,40\n"
174 + "show object pos 20,20 to 40,40\n"
175 + "show object pos ,20,20 to ,40,40\n"
176 + "show object pos ,,30 to ,,~\n"
177 + "show object pos ,,-~ to ,,30",
178 HandleShowObjectByPos); 158 HandleShowObjectByPos);
179 159
180 m_console.Commands.AddCommand( 160 m_console.Commands.AddCommand(
@@ -199,17 +179,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
199 "show part pos", 179 "show part pos",
200 "show part pos <start-coord> to <end-coord>", 180 "show part pos <start-coord> to <end-coord>",
201 "Show details of scene object parts within the given area.", 181 "Show details of scene object parts within the given area.",
202 "Each component of the coord is comma separated. There must be no spaces between the commas.\n" 182 ConsoleUtil.CoordHelp,
203 + "If you don't care about the z component you can simply omit it.\n"
204 + "If you don't care about the x or y components then you can leave them blank (though a comma is still required)\n"
205 + "If you want to specify the maxmimum value of a component then you can use ~ instead of a number\n"
206 + "If you want to specify the minimum value of a component then you can use -~ instead of a number\n"
207 + "e.g.\n"
208 + "show object pos 20,20,20 to 40,40,40\n"
209 + "show object pos 20,20 to 40,40\n"
210 + "show object pos ,20,20 to ,40,40\n"
211 + "show object pos ,,30 to ,,~\n"
212 + "show object pos ,,-~ to ,,30",
213 HandleShowPartByPos); 183 HandleShowPartByPos);
214 } 184 }
215 185