From 9a2b289e328e336f349974302df41b34c92893c3 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sat, 22 Mar 2008 23:52:48 +0000 Subject: [PATCH] Fix compiler warnings in pCampBot, TestSuite, and ScriptEngine/RemoteServer. Thanks daTwitch! --- .../ScriptEngine/RemoteServer/EventManager.cs | 2 +- OpenSim/TestSuite/BotManager.cs | 20 +++++++++---------- OpenSim/TestSuite/Main.cs | 6 +++--- OpenSim/TestSuite/PhysicsBot.cs | 3 +-- OpenSim/Tools/pCampBot/BotManager.cs | 20 +++++++++---------- OpenSim/Tools/pCampBot/PhysicsBot.cs | 2 +- 6 files changed, 26 insertions(+), 27 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs b/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs index 7cdf83879f..54a664329a 100644 --- a/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs @@ -41,7 +41,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer [Serializable] internal class EventManager { - System.Collections.Generic.Dictionary remoteScript = new System.Collections.Generic.Dictionary(); + // TODO: unused: System.Collections.Generic.Dictionary remoteScript = new System.Collections.Generic.Dictionary(); TCPClient m_TCPClient; TRPC_Remote RPC; int myScriptServerID; diff --git a/OpenSim/TestSuite/BotManager.cs b/OpenSim/TestSuite/BotManager.cs index 93b8fede75..c867caeaeb 100644 --- a/OpenSim/TestSuite/BotManager.cs +++ b/OpenSim/TestSuite/BotManager.cs @@ -186,16 +186,16 @@ namespace OpenSim.TestSuite /// /// /// - private string CombineParams(string[] commandParams, int pos) - { - string result = String.Empty; - for (int i = pos; i < commandParams.Length; i++) - { - result += commandParams[i] + " "; - } - result = result.TrimEnd(' '); - return result; - } + // TODO: unused: private string CombineParams(string[] commandParams, int pos) + // TODO: unused: { + // TODO: unused: string result = String.Empty; + // TODO: unused: for (int i = pos; i < commandParams.Length; i++) + // TODO: unused: { + // TODO: unused: result += commandParams[i] + " "; + // TODO: unused: } + // TODO: unused: result = result.TrimEnd(' '); + // TODO: unused: return result; + // TODO: unused: } /// /// 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 a31cf01117..ff4965c09e 100644 --- a/OpenSim/TestSuite/Main.cs +++ b/OpenSim/TestSuite/Main.cs @@ -63,7 +63,7 @@ namespace OpenSim.TestSuite if (config.Get("help") != null || config.Get("loginuri") == null) { Help(); } else { - int botcount = config.GetInt("botcount", 1); + // TODO: unused: int botcount = config.GetInt("botcount", 1); // BotManager bm = new BotManager(); @@ -76,7 +76,7 @@ namespace OpenSim.TestSuite //Set up our nifty config.. thanks to nini ArgvConfigSource cs = new ArgvConfigSource(args); - cs.AddSwitch("Startup", "botcount","n"); + // TODO: unused: cs.AddSwitch("Startup", "botcount","n"); cs.AddSwitch("Startup", "loginuri","l"); cs.AddSwitch("Startup", "firstname"); cs.AddSwitch("Startup", "lastname"); @@ -93,7 +93,7 @@ namespace OpenSim.TestSuite "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" + "Spawns a set of bots to test an OpenSim region\n\n" + " -l, -loginuri loginuri for sim to log into (required)\n" + - " -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" + " -lastname lastname for the bot(s) (default: random string)\n" + " -password password for the bots(s) (default: random string)\n" + diff --git a/OpenSim/TestSuite/PhysicsBot.cs b/OpenSim/TestSuite/PhysicsBot.cs index fd9b73ad5f..792465fa87 100644 --- a/OpenSim/TestSuite/PhysicsBot.cs +++ b/OpenSim/TestSuite/PhysicsBot.cs @@ -57,7 +57,6 @@ namespace OpenSim.TestSuite protected Random somthing = new Random(System.Environment.TickCount);// We do stuff randomly here - private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); //New instance of a SecondLife client public SecondLife client = new SecondLife(); @@ -92,7 +91,7 @@ namespace OpenSim.TestSuite client.Self.Movement.AlwaysRun = false; } - LLVector3 pos = client.Self.SimPosition; + // TODO: unused: LLVector3 pos = client.Self.SimPosition; LLVector3 newpos = new LLVector3(somthing.Next(255), somthing.Next(255), somthing.Next(255)); client.Self.Movement.TurnToward(newpos); diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs index 84648cd21f..a18fa1bfed 100644 --- a/OpenSim/Tools/pCampBot/BotManager.cs +++ b/OpenSim/Tools/pCampBot/BotManager.cs @@ -185,16 +185,16 @@ namespace pCampBot /// /// /// - private string CombineParams(string[] commandParams, int pos) - { - string result = String.Empty; - for (int i = pos; i < commandParams.Length; i++) - { - result += commandParams[i] + " "; - } - result = result.TrimEnd(' '); - return result; - } + // TODO: unused: private string CombineParams(string[] commandParams, int pos) + // TODO: unused: { + // TODO: unused: string result = String.Empty; + // TODO: unused: for (int i = pos; i < commandParams.Length; i++) + // TODO: unused: { + // TODO: unused: result += commandParams[i] + " "; + // TODO: unused: } + // TODO: unused: result = result.TrimEnd(' '); + // TODO: unused: return result; + // TODO: unused: } /// /// 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 b079da6d29..8495b09c50 100644 --- a/OpenSim/Tools/pCampBot/PhysicsBot.cs +++ b/OpenSim/Tools/pCampBot/PhysicsBot.cs @@ -89,7 +89,7 @@ namespace pCampBot client.Self.Movement.AlwaysRun = false; } - LLVector3 pos = client.Self.SimPosition; + // TODO: unused: LLVector3 pos = client.Self.SimPosition; LLVector3 newpos = new LLVector3(somthing.Next(255), somthing.Next(255), somthing.Next(255)); client.Self.Movement.TurnToward(newpos);