aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2008-05-19 13:26:42 +0000
committerJeff Ames2008-05-19 13:26:42 +0000
commit259ddcfe1a655638f8e87f8b3dfec6d9c006140f (patch)
treee6f0f1c461c2dffbb1c9fdc466002c31b5ad5ad2
parentfixing exception when RestPlugin not configured. refactors RestRegionPlugin, ... (diff)
downloadopensim-SC_OLD-259ddcfe1a655638f8e87f8b3dfec6d9c006140f.zip
opensim-SC_OLD-259ddcfe1a655638f8e87f8b3dfec6d9c006140f.tar.gz
opensim-SC_OLD-259ddcfe1a655638f8e87f8b3dfec6d9c006140f.tar.bz2
opensim-SC_OLD-259ddcfe1a655638f8e87f8b3dfec6d9c006140f.tar.xz
Update svn properties. Minor formatting cleanup.
-rw-r--r--OpenSim/TestSuite/BotManager.cs2
-rw-r--r--OpenSim/TestSuite/Main.cs20
-rw-r--r--OpenSim/TestSuite/PhysicsBot.cs6
-rw-r--r--OpenSim/TestSuite/Util.cs3
-rw-r--r--OpenSim/Tools/pCampBot/PhysicsBot.cs6
5 files changed, 13 insertions, 24 deletions
diff --git a/OpenSim/TestSuite/BotManager.cs b/OpenSim/TestSuite/BotManager.cs
index 77e9044..a431a43 100644
--- a/OpenSim/TestSuite/BotManager.cs
+++ b/OpenSim/TestSuite/BotManager.cs
@@ -153,7 +153,7 @@ namespace OpenSim.TestSuite
153 m_log.Info("[ " + callbot.firstname + " " + callbot.lastname + "]: Disconnected"); 153 m_log.Info("[ " + callbot.firstname + " " + callbot.lastname + "]: Disconnected");
154 m_td[m_lBot.IndexOf(callbot)].Abort(); 154 m_td[m_lBot.IndexOf(callbot)].Abort();
155 numbots--; 155 numbots--;
156 if (numbots >1) 156 if (numbots > 1)
157 Environment.Exit(0); 157 Environment.Exit(0);
158 break; 158 break;
159 } 159 }
diff --git a/OpenSim/TestSuite/Main.cs b/OpenSim/TestSuite/Main.cs
index 1a9aa0e..b944304 100644
--- a/OpenSim/TestSuite/Main.cs
+++ b/OpenSim/TestSuite/Main.cs
@@ -33,7 +33,7 @@ namespace OpenSim.TestSuite
33 /// <summary> 33 /// <summary>
34 /// Event Types from the BOT. Add new events here 34 /// Event Types from the BOT. Add new events here
35 /// </summary> 35 /// </summary>
36 public enum EventType:int 36 public enum EventType : int
37 { 37 {
38 NONE = 0, 38 NONE = 0,
39 CONNECTED = 1, 39 CONNECTED = 1,
@@ -84,15 +84,15 @@ namespace OpenSim.TestSuite
84 private static void Help() 84 private static void Help()
85 { 85 {
86 Console.WriteLine( 86 Console.WriteLine(
87 "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" + 87 "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" +
88 "Spawns a set of bots to test an OpenSim region\n\n" + 88 "Spawns a set of bots to test an OpenSim region\n\n" +
89 " -l, -loginuri loginuri for sim to log into (required)\n" + 89 " -l, -loginuri loginuri for sim to log into (required)\n" +
90 // TODO: unused: " -n, -botcount number of bots to start (default: 1)\n" + 90 // TODO: unused: " -n, -botcount number of bots to start (default: 1)\n" +
91 " -firstname first name for the bot(s) (default: random string)\n" + 91 " -firstname first name for the bot(s) (default: random string)\n" +
92 " -lastname lastname for the bot(s) (default: random string)\n" + 92 " -lastname lastname for the bot(s) (default: random string)\n" +
93 " -password password for the bots(s) (default: random string)\n" + 93 " -password password for the bots(s) (default: random string)\n" +
94 " -h, -help show this message" 94 " -h, -help show this message"
95 ); 95 );
96 } 96 }
97 } 97 }
98} 98}
diff --git a/OpenSim/TestSuite/PhysicsBot.cs b/OpenSim/TestSuite/PhysicsBot.cs
index a7bbe80..0e02aef 100644
--- a/OpenSim/TestSuite/PhysicsBot.cs
+++ b/OpenSim/TestSuite/PhysicsBot.cs
@@ -54,7 +54,6 @@ namespace OpenSim.TestSuite
54 54
55 protected Random somthing = new Random(Environment.TickCount);// We do stuff randomly here 55 protected Random somthing = new Random(Environment.TickCount);// We do stuff randomly here
56 56
57
58 //New instance of a SecondLife client 57 //New instance of a SecondLife client
59 public SecondLife client = new SecondLife(); 58 public SecondLife client = new SecondLife();
60 59
@@ -104,7 +103,6 @@ namespace OpenSim.TestSuite
104 client.Self.Chat(randomf, 0, ChatType.Normal); 103 client.Self.Chat(randomf, 0, ChatType.Normal);
105 104
106 //Thread.Sleep(somthing.Next(1, 10)); // Apparently its better without it right now. 105 //Thread.Sleep(somthing.Next(1, 10)); // Apparently its better without it right now.
107
108 } 106 }
109 107
110 /// <summary> 108 /// <summary>
@@ -116,9 +114,6 @@ namespace OpenSim.TestSuite
116 lastname = startupConfig.GetString("lastname", "random"); 114 lastname = startupConfig.GetString("lastname", "random");
117 password = startupConfig.GetString("password", "12345"); 115 password = startupConfig.GetString("password", "12345");
118 loginURI = startupConfig.GetString("loginuri"); 116 loginURI = startupConfig.GetString("loginuri");
119
120
121
122 } 117 }
123 118
124 /// <summary> 119 /// <summary>
@@ -148,7 +143,6 @@ namespace OpenSim.TestSuite
148 m_action.Start(); 143 m_action.Start();
149 OnConnected(this, EventType.CONNECTED); 144 OnConnected(this, EventType.CONNECTED);
150 client.Self.Jump(); 145 client.Self.Jump();
151
152 } 146 }
153 } 147 }
154 else 148 else
diff --git a/OpenSim/TestSuite/Util.cs b/OpenSim/TestSuite/Util.cs
index 5823af4..fc8a5c4 100644
--- a/OpenSim/TestSuite/Util.cs
+++ b/OpenSim/TestSuite/Util.cs
@@ -31,7 +31,8 @@ namespace OpenSim.TestSuite
31{ 31{
32 public class Utils 32 public class Utils
33 { 33 {
34 enum Result { 34 enum Result
35 {
35 Fail = 0, 36 Fail = 0,
36 Pass = 1, 37 Pass = 1,
37 Skip = 3 38 Skip = 3
diff --git a/OpenSim/Tools/pCampBot/PhysicsBot.cs b/OpenSim/Tools/pCampBot/PhysicsBot.cs
index 960be9b..49c3c78 100644
--- a/OpenSim/Tools/pCampBot/PhysicsBot.cs
+++ b/OpenSim/Tools/pCampBot/PhysicsBot.cs
@@ -103,7 +103,6 @@ namespace pCampBot
103 client.Self.Chat(randomf, 0, ChatType.Normal); 103 client.Self.Chat(randomf, 0, ChatType.Normal);
104 104
105 //Thread.Sleep(somthing.Next(1, 10)); // Apparently its better without it right now. 105 //Thread.Sleep(somthing.Next(1, 10)); // Apparently its better without it right now.
106
107 } 106 }
108 107
109 /// <summary> 108 /// <summary>
@@ -115,9 +114,6 @@ namespace pCampBot
115 lastname = startupConfig.GetString("lastname", "random"); 114 lastname = startupConfig.GetString("lastname", "random");
116 password = startupConfig.GetString("password", "12345"); 115 password = startupConfig.GetString("password", "12345");
117 loginURI = startupConfig.GetString("loginuri"); 116 loginURI = startupConfig.GetString("loginuri");
118
119
120
121 } 117 }
122 118
123 /// <summary> 119 /// <summary>
@@ -139,7 +135,6 @@ namespace pCampBot
139 client.Network.OnDisconnected += new NetworkManager.DisconnectedCallback(this.Network_OnDisconnected); 135 client.Network.OnDisconnected += new NetworkManager.DisconnectedCallback(this.Network_OnDisconnected);
140 if (client.Network.Login(firstname, lastname, password, "pCampBot", "Your name")) 136 if (client.Network.Login(firstname, lastname, password, "pCampBot", "Your name"))
141 { 137 {
142
143 if (OnConnected != null) 138 if (OnConnected != null)
144 { 139 {
145 m_action = new Timer(somthing.Next(1000, 10000)); 140 m_action = new Timer(somthing.Next(1000, 10000));
@@ -147,7 +142,6 @@ namespace pCampBot
147 m_action.Start(); 142 m_action.Start();
148 OnConnected(this, EventType.CONNECTED); 143 OnConnected(this, EventType.CONNECTED);
149 client.Self.Jump(); 144 client.Self.Jump();
150
151 } 145 }
152 } 146 }
153 else 147 else