OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties. Minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-05-19 13:26:42 +00:00
parent 4e93228e25
commit 259ddcfe1a
5 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/TestSuite/BotManager.cs
View File

@ -153,7 +153,7 @@ namespace OpenSim.TestSuite
m_log.Info("[ " + callbot.firstname + " " + callbot.lastname + "]: Disconnected"); m_log.Info("[ " + callbot.firstname + " " + callbot.lastname + "]: Disconnected");
m_td[m_lBot.IndexOf(callbot)].Abort(); m_td[m_lBot.IndexOf(callbot)].Abort();
numbots--; numbots--;
if (numbots >1) if (numbots > 1)
Environment.Exit(0); Environment.Exit(0);
break; break;
} }

20
OpenSim/TestSuite/Main.cs
View File

@ -33,7 +33,7 @@ namespace OpenSim.TestSuite
/// <summary> /// <summary>
/// Event Types from the BOT. Add new events here /// Event Types from the BOT. Add new events here
/// </summary> /// </summary>
public enum EventType:int public enum EventType : int
{ {
NONE = 0, NONE = 0,
CONNECTED = 1, CONNECTED = 1,
@ -84,15 +84,15 @@ namespace OpenSim.TestSuite
private static void Help() private static void Help()
{ {
Console.WriteLine( Console.WriteLine(
"usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" + "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" +
"Spawns a set of bots to test an OpenSim region\n\n" + "Spawns a set of bots to test an OpenSim region\n\n" +
" -l, -loginuri loginuri for sim to log into (required)\n" + " -l, -loginuri loginuri for sim to log into (required)\n" +
// TODO: unused: " -n, -botcount number of bots to start (default: 1)\n" + // TODO: unused: " -n, -botcount number of bots to start (default: 1)\n" +
" -firstname first name for the bot(s) (default: random string)\n" + " -firstname first name for the bot(s) (default: random string)\n" +
" -lastname lastname for the bot(s) (default: random string)\n" + " -lastname lastname for the bot(s) (default: random string)\n" +
" -password password for the bots(s) (default: random string)\n" + " -password password for the bots(s) (default: random string)\n" +
" -h, -help show this message" " -h, -help show this message"
); );
} }
} }
} }

6
OpenSim/TestSuite/PhysicsBot.cs
View File

@ -54,7 +54,6 @@ namespace OpenSim.TestSuite
protected Random somthing = new Random(Environment.TickCount);// We do stuff randomly here protected Random somthing = new Random(Environment.TickCount);// We do stuff randomly here
//New instance of a SecondLife client //New instance of a SecondLife client
public SecondLife client = new SecondLife(); public SecondLife client = new SecondLife();
@ -104,7 +103,6 @@ namespace OpenSim.TestSuite
client.Self.Chat(randomf, 0, ChatType.Normal); client.Self.Chat(randomf, 0, ChatType.Normal);
//Thread.Sleep(somthing.Next(1, 10)); // Apparently its better without it right now. //Thread.Sleep(somthing.Next(1, 10)); // Apparently its better without it right now.
} }
/// <summary> /// <summary>
@ -116,9 +114,6 @@ namespace OpenSim.TestSuite
lastname = startupConfig.GetString("lastname", "random"); lastname = startupConfig.GetString("lastname", "random");
password = startupConfig.GetString("password", "12345"); password = startupConfig.GetString("password", "12345");
loginURI = startupConfig.GetString("loginuri"); loginURI = startupConfig.GetString("loginuri");
} }
/// <summary> /// <summary>
@ -148,7 +143,6 @@ namespace OpenSim.TestSuite
m_action.Start(); m_action.Start();
OnConnected(this, EventType.CONNECTED); OnConnected(this, EventType.CONNECTED);
client.Self.Jump(); client.Self.Jump();
} }
} }
else else

3
OpenSim/TestSuite/Util.cs
View File

@ -31,7 +31,8 @@ namespace OpenSim.TestSuite
{ {
public class Utils public class Utils
{ {
enum Result { enum Result
{
Fail = 0, Fail = 0,
Pass = 1, Pass = 1,
Skip = 3 Skip = 3

6
OpenSim/Tools/pCampBot/PhysicsBot.cs
View File

@ -103,7 +103,6 @@ namespace pCampBot
client.Self.Chat(randomf, 0, ChatType.Normal); client.Self.Chat(randomf, 0, ChatType.Normal);
//Thread.Sleep(somthing.Next(1, 10)); // Apparently its better without it right now. //Thread.Sleep(somthing.Next(1, 10)); // Apparently its better without it right now.
} }
/// <summary> /// <summary>
@ -115,9 +114,6 @@ namespace pCampBot
lastname = startupConfig.GetString("lastname", "random"); lastname = startupConfig.GetString("lastname", "random");
password = startupConfig.GetString("password", "12345"); password = startupConfig.GetString("password", "12345");
loginURI = startupConfig.GetString("loginuri"); loginURI = startupConfig.GetString("loginuri");
} }
/// <summary> /// <summary>
@ -139,7 +135,6 @@ namespace pCampBot
client.Network.OnDisconnected += new NetworkManager.DisconnectedCallback(this.Network_OnDisconnected); client.Network.OnDisconnected += new NetworkManager.DisconnectedCallback(this.Network_OnDisconnected);
if (client.Network.Login(firstname, lastname, password, "pCampBot", "Your name")) if (client.Network.Login(firstname, lastname, password, "pCampBot", "Your name"))
{ {
if (OnConnected != null) if (OnConnected != null)
{ {
m_action = new Timer(somthing.Next(1000, 10000)); m_action = new Timer(somthing.Next(1000, 10000));
@ -147,7 +142,6 @@ namespace pCampBot
m_action.Start(); m_action.Start();
OnConnected(this, EventType.CONNECTED); OnConnected(this, EventType.CONNECTED);
client.Self.Jump(); client.Self.Jump();
} }
} }
else else