From daf7b8ec76bb333d4808e8cd4392a002042ac2d0 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Wed, 4 Jul 2007 05:25:40 +0000 Subject: [PATCH] * Cleaning - attempting to get compiler warnings back down to zero. --- OpenSim/Framework/Servers/BaseHttpServer.cs | 2 +- OpenSim/Region/Application/OpenSimMain.cs | 15 +++++++++------ .../ClientStack/ClientView.ProcessPackets.cs | 2 +- .../scripting/Engines/CSharpScriptEngine.cs | 4 ++-- .../Scenes/scripting/Engines/JScriptEngine.cs | 4 ++-- .../Region/Terrain.BasicTerrain/TerrainFilter.cs | 6 +++--- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 81028b05d4..8fa577c40b 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs @@ -187,7 +187,7 @@ namespace OpenSim.Framework.Servers responseString = ProcessXMLRPCMethod(methodName, request); } - catch (Exception e) + catch { //Console.WriteLine(e.ToString()); } diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 17a32cf215..eaa067b007 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -446,15 +446,18 @@ namespace OpenSim break; case "users": ScenePresence TempAv; - m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP")); - /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) + m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP","World")); + for (int i = 0; i < m_localWorld.Count; i++) + { + foreach (libsecondlife.LLUUID UUID in ((Scene)m_localWorld[i]).Entities.Keys) { - if (LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar") + if (((Scene)m_localWorld[i]).Entities[UUID].ToString() == "OpenSim.world.Avatar") { - TempAv = (OpenSim.world.Avatar)LocalWorld.Entities[UUID]; - m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString())); + TempAv = (ScenePresence)((Scene)m_localWorld[i]).Entities[UUID]; + m_log.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.AgentId, "Unknown", "Unknown"), ((Scene)m_localWorld[i]).RegionInfo.RegionName); } - }*/ + } + } break; } } diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs index 8419906053..7f961ef416 100644 --- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs +++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs @@ -378,7 +378,7 @@ namespace OpenSim.Region.ClientStack // Console.WriteLine(Pack.ToString()); RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack; ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket(); - bool foundent = false; + //bool foundent = false; /* foreach (Entity ent in m_world.Entities.Values) { if (ent.localid == requesttask.InventoryData.LocalID) diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs index 56f5c0bddc..7928088179 100644 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs +++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs @@ -40,7 +40,7 @@ namespace OpenSim.Region.Enviorment.Scripting return ".cs"; } - private Dictionary LoadDotNetScript(ICodeCompiler compiler, string filename) + private Dictionary LoadDotNetScript(CodeDomProvider compiler, string filename) { CompilerParameters compilerParams = new CompilerParameters(); CompilerResults compilerResults; @@ -96,7 +96,7 @@ namespace OpenSim.Region.Enviorment.Scripting public Dictionary compile(string filename) { CSharpCodeProvider csharpProvider = new CSharpCodeProvider(); - return LoadDotNetScript(csharpProvider.CreateCompiler(), filename); + return LoadDotNetScript(csharpProvider, filename); } } } diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs index 2cea6e028e..d9d6f7eca9 100644 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs +++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs @@ -40,7 +40,7 @@ namespace OpenSim.Region.Enviorment.Scripting return ".js"; } - private Dictionary LoadDotNetScript(ICodeCompiler compiler, string filename) + private Dictionary LoadDotNetScript(CodeDomProvider compiler, string filename) { CompilerParameters compilerParams = new CompilerParameters(); CompilerResults compilerResults; @@ -96,7 +96,7 @@ namespace OpenSim.Region.Enviorment.Scripting public Dictionary compile(string filename) { JScriptCodeProvider jscriptProvider = new JScriptCodeProvider(); - return LoadDotNetScript(jscriptProvider.CreateCompiler(), filename); + return LoadDotNetScript(jscriptProvider, filename); } } } diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs index feb9327a87..a38be0799a 100644 --- a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs +++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs @@ -63,7 +63,7 @@ namespace OpenSim.Region.Terrain { public Dictionary filters = new Dictionary(); - private void LoadFilter(ICodeCompiler compiler, string filename) + private void LoadFilter(CodeDomProvider compiler, string filename) { CompilerParameters compilerParams = new CompilerParameters(); CompilerResults compilerResults; @@ -114,13 +114,13 @@ namespace OpenSim.Region.Terrain public void LoadFilterCSharp(string filename) { CSharpCodeProvider compiler = new CSharpCodeProvider(); - LoadFilter(compiler.CreateCompiler(), filename); + LoadFilter(compiler, filename); } public void LoadFilterJScript(string filename) { JScriptCodeProvider compiler = new JScriptCodeProvider(); - LoadFilter(compiler.CreateCompiler(), filename); + LoadFilter(compiler, filename); } } }