Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

minor: Move co-ordinate related help to object commands to common Con…

…soleUtil.CoordHelp
  • Loading branch information...
commit 938fa96b9f5377ef330171232262b4d8aaca0918 1 parent 319ebac
Justin Clark-Casey authored October 24, 2012
17  OpenSim/Framework/Console/ConsoleUtil.cs
@@ -36,6 +36,23 @@ public class ConsoleUtil
36 36
 {
37 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.
  45
+If you don't care about the z component you can simply omit it.
  46
+If you don't care about the x or y components then you can leave them blank (though a comma is still required)
  47
+If you want to specify the maxmimum value of a component then you can use ~ instead of a number
  48
+If you want to specify the minimum value of a component then you can use -~ instead of a number
  49
+e.g.
  50
+delete object pos 20,20,20 to 40,40,40
  51
+delete object pos 20,20 to 40,40
  52
+delete object pos ,20,20 to ,40,40
  53
+delete object pos ,,30 to ,,~
  54
+delete object pos ,,-~ to ,,30";
  55
+
39 56
     public const string MinRawConsoleVectorValue = "-~";
40 57
     public const string MaxRawConsoleVectorValue = "~";
41 58
 
36  OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -122,17 +122,7 @@ public void AddRegion(Scene scene)
122 122
                 "delete object pos",
123 123
                 "delete object pos <start-coord> to <end-coord>",
124 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"
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",
  125
+                ConsoleUtil.CoordHelp,
136 126
                 HandleDeleteObject);
137 127
 
138 128
             m_console.Commands.AddCommand(
@@ -164,17 +154,7 @@ public void AddRegion(Scene scene)
164 154
                 "Show details of scene objects within the given area.",
165 155
                 "The --full option will print out information on all the parts of the object.\n"
166 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"
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",
  157
+                    + ConsoleUtil.CoordHelp,
178 158
                 HandleShowObjectByPos);
179 159
 
180 160
             m_console.Commands.AddCommand(
@@ -199,17 +179,7 @@ public void AddRegion(Scene scene)
199 179
                 "show part pos",
200 180
                 "show part pos <start-coord> to <end-coord>",
201 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"
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",
  182
+                ConsoleUtil.CoordHelp,
213 183
                 HandleShowPartByPos);
214 184
         }
215 185
 

0 notes on commit 938fa96

Please sign in to comment.
Something went wrong with that request. Please try again.