aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJeff Ames2008-03-22 23:52:48 +0000
committerJeff Ames2008-03-22 23:52:48 +0000
commit9a2b289e328e336f349974302df41b34c92893c3 (patch)
treec44b4ae8c862446e3f04df8237563f544ed96063 /OpenSim
parentUpdate svn properties. (diff)
downloadopensim-SC_OLD-9a2b289e328e336f349974302df41b34c92893c3.zip
opensim-SC_OLD-9a2b289e328e336f349974302df41b34c92893c3.tar.gz
opensim-SC_OLD-9a2b289e328e336f349974302df41b34c92893c3.tar.bz2
opensim-SC_OLD-9a2b289e328e336f349974302df41b34c92893c3.tar.xz
Fix compiler warnings in pCampBot, TestSuite, and ScriptEngine/RemoteServer. Thanks daTwitch!
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs2
-rw-r--r--OpenSim/TestSuite/BotManager.cs20
-rw-r--r--OpenSim/TestSuite/Main.cs6
-rw-r--r--OpenSim/TestSuite/PhysicsBot.cs3
-rw-r--r--OpenSim/Tools/pCampBot/BotManager.cs20
-rw-r--r--OpenSim/Tools/pCampBot/PhysicsBot.cs2
6 files changed, 26 insertions, 27 deletions
diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs b/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
index 7cdf838..54a6643 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
41 [Serializable] 41 [Serializable]
42 internal class EventManager 42 internal class EventManager
43 { 43 {
44 System.Collections.Generic.Dictionary<uint, ScriptServerInterfaces.ServerRemotingObject> remoteScript = new System.Collections.Generic.Dictionary<uint, ScriptServerInterfaces.ServerRemotingObject>(); 44 // TODO: unused: System.Collections.Generic.Dictionary<uint, ScriptServerInterfaces.ServerRemotingObject> remoteScript = new System.Collections.Generic.Dictionary<uint, ScriptServerInterfaces.ServerRemotingObject>();
45 TCPClient m_TCPClient; 45 TCPClient m_TCPClient;
46 TRPC_Remote RPC; 46 TRPC_Remote RPC;
47 int myScriptServerID; 47 int myScriptServerID;
diff --git a/OpenSim/TestSuite/BotManager.cs b/OpenSim/TestSuite/BotManager.cs
index 93b8fed..c867cae 100644
--- a/OpenSim/TestSuite/BotManager.cs
+++ b/OpenSim/TestSuite/BotManager.cs
@@ -186,16 +186,16 @@ namespace OpenSim.TestSuite
186 /// <param name="commandParams"></param> 186 /// <param name="commandParams"></param>
187 /// <param name="pos"></param> 187 /// <param name="pos"></param>
188 /// <returns></returns> 188 /// <returns></returns>
189 private string CombineParams(string[] commandParams, int pos) 189 // TODO: unused: private string CombineParams(string[] commandParams, int pos)
190 { 190 // TODO: unused: {
191 string result = String.Empty; 191 // TODO: unused: string result = String.Empty;
192 for (int i = pos; i < commandParams.Length; i++) 192 // TODO: unused: for (int i = pos; i < commandParams.Length; i++)
193 { 193 // TODO: unused: {
194 result += commandParams[i] + " "; 194 // TODO: unused: result += commandParams[i] + " ";
195 } 195 // TODO: unused: }
196 result = result.TrimEnd(' '); 196 // TODO: unused: result = result.TrimEnd(' ');
197 return result; 197 // TODO: unused: return result;
198 } 198 // TODO: unused: }
199 199
200 /// <summary> 200 /// <summary>
201 /// Command runnint tool.. Currently use it to add bots, shutdown and (dangerous)Forcequit 201 /// Command runnint tool.. Currently use it to add bots, shutdown and (dangerous)Forcequit
diff --git a/OpenSim/TestSuite/Main.cs b/OpenSim/TestSuite/Main.cs
index a31cf01..ff4965c 100644
--- a/OpenSim/TestSuite/Main.cs
+++ b/OpenSim/TestSuite/Main.cs
@@ -63,7 +63,7 @@ namespace OpenSim.TestSuite
63 if (config.Get("help") != null || config.Get("loginuri") == null) { 63 if (config.Get("help") != null || config.Get("loginuri") == null) {
64 Help(); 64 Help();
65 } else { 65 } else {
66 int botcount = config.GetInt("botcount", 1); 66 // TODO: unused: int botcount = config.GetInt("botcount", 1);
67 67
68 // BotManager bm = new BotManager(); 68 // BotManager bm = new BotManager();
69 69
@@ -76,7 +76,7 @@ namespace OpenSim.TestSuite
76 //Set up our nifty config.. thanks to nini 76 //Set up our nifty config.. thanks to nini
77 ArgvConfigSource cs = new ArgvConfigSource(args); 77 ArgvConfigSource cs = new ArgvConfigSource(args);
78 78
79 cs.AddSwitch("Startup", "botcount","n"); 79 // TODO: unused: cs.AddSwitch("Startup", "botcount","n");
80 cs.AddSwitch("Startup", "loginuri","l"); 80 cs.AddSwitch("Startup", "loginuri","l");
81 cs.AddSwitch("Startup", "firstname"); 81 cs.AddSwitch("Startup", "firstname");
82 cs.AddSwitch("Startup", "lastname"); 82 cs.AddSwitch("Startup", "lastname");
@@ -93,7 +93,7 @@ namespace OpenSim.TestSuite
93 "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" + 93 "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" +
94 "Spawns a set of bots to test an OpenSim region\n\n" + 94 "Spawns a set of bots to test an OpenSim region\n\n" +
95 " -l, -loginuri loginuri for sim to log into (required)\n" + 95 " -l, -loginuri loginuri for sim to log into (required)\n" +
96 " -n, -botcount number of bots to start (default: 1)\n" + 96 // TODO: unused: " -n, -botcount number of bots to start (default: 1)\n" +
97 " -firstname first name for the bot(s) (default: random string)\n" + 97 " -firstname first name for the bot(s) (default: random string)\n" +
98 " -lastname lastname for the bot(s) (default: random string)\n" + 98 " -lastname lastname for the bot(s) (default: random string)\n" +
99 " -password password for the bots(s) (default: random string)\n" + 99 " -password password for the bots(s) (default: random string)\n" +
diff --git a/OpenSim/TestSuite/PhysicsBot.cs b/OpenSim/TestSuite/PhysicsBot.cs
index fd9b73a..792465f 100644
--- a/OpenSim/TestSuite/PhysicsBot.cs
+++ b/OpenSim/TestSuite/PhysicsBot.cs
@@ -57,7 +57,6 @@ namespace OpenSim.TestSuite
57 57
58 protected Random somthing = new Random(System.Environment.TickCount);// We do stuff randomly here 58 protected Random somthing = new Random(System.Environment.TickCount);// We do stuff randomly here
59 59
60 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
61 60
62 //New instance of a SecondLife client 61 //New instance of a SecondLife client
63 public SecondLife client = new SecondLife(); 62 public SecondLife client = new SecondLife();
@@ -92,7 +91,7 @@ namespace OpenSim.TestSuite
92 client.Self.Movement.AlwaysRun = false; 91 client.Self.Movement.AlwaysRun = false;
93 } 92 }
94 93
95 LLVector3 pos = client.Self.SimPosition; 94 // TODO: unused: LLVector3 pos = client.Self.SimPosition;
96 LLVector3 newpos = new LLVector3(somthing.Next(255), somthing.Next(255), somthing.Next(255)); 95 LLVector3 newpos = new LLVector3(somthing.Next(255), somthing.Next(255), somthing.Next(255));
97 client.Self.Movement.TurnToward(newpos); 96 client.Self.Movement.TurnToward(newpos);
98 97
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 84648cd..a18fa1b 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -185,16 +185,16 @@ namespace pCampBot
185 /// <param name="commandParams"></param> 185 /// <param name="commandParams"></param>
186 /// <param name="pos"></param> 186 /// <param name="pos"></param>
187 /// <returns></returns> 187 /// <returns></returns>
188 private string CombineParams(string[] commandParams, int pos) 188 // TODO: unused: private string CombineParams(string[] commandParams, int pos)
189 { 189 // TODO: unused: {
190 string result = String.Empty; 190 // TODO: unused: string result = String.Empty;
191 for (int i = pos; i < commandParams.Length; i++) 191 // TODO: unused: for (int i = pos; i < commandParams.Length; i++)
192 { 192 // TODO: unused: {
193 result += commandParams[i] + " "; 193 // TODO: unused: result += commandParams[i] + " ";
194 } 194 // TODO: unused: }
195 result = result.TrimEnd(' '); 195 // TODO: unused: result = result.TrimEnd(' ');
196 return result; 196 // TODO: unused: return result;
197 } 197 // TODO: unused: }
198 198
199 /// <summary> 199 /// <summary>
200 /// Command runnint tool.. Currently use it to add bots, shutdown and (dangerous)Forcequit 200 /// Command runnint tool.. Currently use it to add bots, shutdown and (dangerous)Forcequit
diff --git a/OpenSim/Tools/pCampBot/PhysicsBot.cs b/OpenSim/Tools/pCampBot/PhysicsBot.cs
index b079da6..8495b09 100644
--- a/OpenSim/Tools/pCampBot/PhysicsBot.cs
+++ b/OpenSim/Tools/pCampBot/PhysicsBot.cs
@@ -89,7 +89,7 @@ namespace pCampBot
89 client.Self.Movement.AlwaysRun = false; 89 client.Self.Movement.AlwaysRun = false;
90 } 90 }
91 91
92 LLVector3 pos = client.Self.SimPosition; 92 // TODO: unused: LLVector3 pos = client.Self.SimPosition;
93 LLVector3 newpos = new LLVector3(somthing.Next(255), somthing.Next(255), somthing.Next(255)); 93 LLVector3 newpos = new LLVector3(somthing.Next(255), somthing.Next(255), somthing.Next(255));
94 client.Self.Movement.TurnToward(newpos); 94 client.Self.Movement.TurnToward(newpos);
95 95