diff options
author | Jeff Ames | 2008-08-18 00:39:10 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-18 00:39:10 +0000 |
commit | 6ef9d4da901a346c232458317cca6268da888e2e (patch) | |
tree | dd1d935b10f34f261839da9f9879c02322e8ede7 /OpenSim/Tools | |
parent | Update svn properties, minor formatting cleanup. (diff) | |
download | opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.zip opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.gz opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.bz2 opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Tools')
-rw-r--r-- | OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tools/OpenSim.GUI/InputTextBoxControl.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/BotManager.cs | 10 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/pCampBot.cs | 10 |
4 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs index dbc58ff..25044db 100644 --- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs +++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs | |||
@@ -123,7 +123,7 @@ namespace LaunchSLClient | |||
123 | string sandboxHostName = ""; | 123 | string sandboxHostName = ""; |
124 | string sandboxPort = ""; | 124 | string sandboxPort = ""; |
125 | string text; | 125 | string text; |
126 | 126 | ||
127 | Regex myRegex = new Regex(".*internal_ip_port=\\\"(?<port>.*?)\\\".*external_host_name=\\\"(?<name>.*?)\\\".*"); | 127 | Regex myRegex = new Regex(".*internal_ip_port=\\\"(?<port>.*?)\\\".*external_host_name=\\\"(?<name>.*?)\\\".*"); |
128 | 128 | ||
129 | FileInfo defaultFile = new FileInfo("Regions/default.xml"); | 129 | FileInfo defaultFile = new FileInfo("Regions/default.xml"); |
diff --git a/OpenSim/Tools/OpenSim.GUI/InputTextBoxControl.cs b/OpenSim/Tools/OpenSim.GUI/InputTextBoxControl.cs index a43795a..d6a3d04 100644 --- a/OpenSim/Tools/OpenSim.GUI/InputTextBoxControl.cs +++ b/OpenSim/Tools/OpenSim.GUI/InputTextBoxControl.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.GUI | |||
38 | { | 38 | { |
39 | this.KeyDown += new System.Windows.Forms.KeyEventHandler(TextInputControl_KeyDown); | 39 | this.KeyDown += new System.Windows.Forms.KeyEventHandler(TextInputControl_KeyDown); |
40 | } | 40 | } |
41 | 41 | ||
42 | private List<string> CommandHistory = new List<string>(); | 42 | private List<string> CommandHistory = new List<string>(); |
43 | private bool InHistory = false; | 43 | private bool InHistory = false; |
44 | private int HistoryPosition = -1; | 44 | private int HistoryPosition = -1; |
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs index 302dc08..4bdc494 100644 --- a/OpenSim/Tools/pCampBot/BotManager.cs +++ b/OpenSim/Tools/pCampBot/BotManager.cs | |||
@@ -51,7 +51,7 @@ namespace pCampBot | |||
51 | protected Random somthing = new Random(Environment.TickCount); | 51 | protected Random somthing = new Random(Environment.TickCount); |
52 | protected int numbots = 0; | 52 | protected int numbots = 0; |
53 | protected IConfig Previous_config; | 53 | protected IConfig Previous_config; |
54 | 54 | ||
55 | /// <summary> | 55 | /// <summary> |
56 | /// Constructor Creates MainConsole.Instance to take commands and provide the place to write data | 56 | /// Constructor Creates MainConsole.Instance to take commands and provide the place to write data |
57 | /// </summary> | 57 | /// </summary> |
@@ -96,7 +96,7 @@ namespace pCampBot | |||
96 | startupBot(i, Previous_config); | 96 | startupBot(i, Previous_config); |
97 | } | 97 | } |
98 | } | 98 | } |
99 | 99 | ||
100 | /// <summary> | 100 | /// <summary> |
101 | /// This starts up the bot and stores the thread for the bot in the thread array | 101 | /// This starts up the bot and stores the thread for the bot in the thread array |
102 | /// </summary> | 102 | /// </summary> |
@@ -127,7 +127,7 @@ namespace pCampBot | |||
127 | { | 127 | { |
128 | string returnstring = ""; | 128 | string returnstring = ""; |
129 | string chars = "abcdefghijklmnopqrstuvwxyz0123456789"; | 129 | string chars = "abcdefghijklmnopqrstuvwxyz0123456789"; |
130 | 130 | ||
131 | for (int i = 0; i < 7; i++) | 131 | for (int i = 0; i < 7; i++) |
132 | { | 132 | { |
133 | returnstring += chars.Substring(somthing.Next(chars.Length),1); | 133 | returnstring += chars.Substring(somthing.Next(chars.Length),1); |
@@ -177,7 +177,7 @@ namespace pCampBot | |||
177 | { | 177 | { |
178 | return new ConsoleBase("Region", this); | 178 | return new ConsoleBase("Region", this); |
179 | } | 179 | } |
180 | 180 | ||
181 | /// <summary> | 181 | /// <summary> |
182 | /// Command runnint tool.. Currently use it to add bots, shutdown and (dangerous)Forcequit | 182 | /// Command runnint tool.. Currently use it to add bots, shutdown and (dangerous)Forcequit |
183 | /// </summary> | 183 | /// </summary> |
@@ -198,7 +198,7 @@ namespace pCampBot | |||
198 | case "addbots": | 198 | case "addbots": |
199 | int newbots; | 199 | int newbots; |
200 | Helpers.TryParse(cmdparams[0], out newbots); | 200 | Helpers.TryParse(cmdparams[0], out newbots); |
201 | 201 | ||
202 | if (newbots > 0) | 202 | if (newbots > 0) |
203 | addbots(newbots); | 203 | addbots(newbots); |
204 | break; | 204 | break; |
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs index 81ec2b2..9cde451 100644 --- a/OpenSim/Tools/pCampBot/pCampBot.cs +++ b/OpenSim/Tools/pCampBot/pCampBot.cs | |||
@@ -54,9 +54,9 @@ namespace pCampBot | |||
54 | else | 54 | else |
55 | { | 55 | { |
56 | int botcount = config.GetInt("botcount", 1); | 56 | int botcount = config.GetInt("botcount", 1); |
57 | 57 | ||
58 | BotManager bm = new BotManager(); | 58 | BotManager bm = new BotManager(); |
59 | 59 | ||
60 | //startup specified number of bots. 1 is the default | 60 | //startup specified number of bots. 1 is the default |
61 | bm.dobotStartup(botcount, config); | 61 | bm.dobotStartup(botcount, config); |
62 | while (true) | 62 | while (true) |
@@ -70,18 +70,18 @@ namespace pCampBot | |||
70 | { | 70 | { |
71 | //Set up our nifty config.. thanks to nini | 71 | //Set up our nifty config.. thanks to nini |
72 | ArgvConfigSource cs = new ArgvConfigSource(args); | 72 | ArgvConfigSource cs = new ArgvConfigSource(args); |
73 | 73 | ||
74 | cs.AddSwitch("Startup", "botcount","n"); | 74 | cs.AddSwitch("Startup", "botcount","n"); |
75 | cs.AddSwitch("Startup", "loginuri","l"); | 75 | cs.AddSwitch("Startup", "loginuri","l"); |
76 | cs.AddSwitch("Startup", "firstname"); | 76 | cs.AddSwitch("Startup", "firstname"); |
77 | cs.AddSwitch("Startup", "lastname"); | 77 | cs.AddSwitch("Startup", "lastname"); |
78 | cs.AddSwitch("Startup", "password"); | 78 | cs.AddSwitch("Startup", "password"); |
79 | cs.AddSwitch("Startup", "help","h"); | 79 | cs.AddSwitch("Startup", "help","h"); |
80 | 80 | ||
81 | IConfig ol = cs.Configs["Startup"]; | 81 | IConfig ol = cs.Configs["Startup"]; |
82 | return ol; | 82 | return ol; |
83 | } | 83 | } |
84 | 84 | ||
85 | private static void Help() | 85 | private static void Help() |
86 | { | 86 | { |
87 | Console.WriteLine( | 87 | Console.WriteLine( |