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

* Cleaning - attempting to get compiler warnings back down to zero.

Sugilite
Adam Frisby 2007-07-04 05:25:40 +00:00
parent 8b3cb93b49
commit daf7b8ec76
6 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@ -187,7 +187,7 @@ namespace OpenSim.Framework.Servers
responseString = ProcessXMLRPCMethod(methodName, request); responseString = ProcessXMLRPCMethod(methodName, request);
} }
catch (Exception e) catch
{ {
//Console.WriteLine(e.ToString()); //Console.WriteLine(e.ToString());
} }

15
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -446,15 +446,18 @@ namespace OpenSim
break; break;
case "users": case "users":
ScenePresence TempAv; 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")); 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"));
/* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) for (int i = 0; i < m_localWorld.Count; i++)
{ {
if (LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar") foreach (libsecondlife.LLUUID UUID in ((Scene)m_localWorld[i]).Entities.Keys)
{ {
TempAv = (OpenSim.world.Avatar)LocalWorld.Entities[UUID]; if (((Scene)m_localWorld[i]).Entities[UUID].ToString() == "OpenSim.world.Avatar")
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; break;
} }
} }

2
OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
View File

@ -378,7 +378,7 @@ namespace OpenSim.Region.ClientStack
// Console.WriteLine(Pack.ToString()); // Console.WriteLine(Pack.ToString());
RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack; RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack;
ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket(); ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket();
bool foundent = false; //bool foundent = false;
/* foreach (Entity ent in m_world.Entities.Values) /* foreach (Entity ent in m_world.Entities.Values)
{ {
if (ent.localid == requesttask.InventoryData.LocalID) if (ent.localid == requesttask.InventoryData.LocalID)

4
OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
View File

@ -40,7 +40,7 @@ namespace OpenSim.Region.Enviorment.Scripting
return ".cs"; return ".cs";
} }
private Dictionary<string,IScript> LoadDotNetScript(ICodeCompiler compiler, string filename) private Dictionary<string,IScript> LoadDotNetScript(CodeDomProvider compiler, string filename)
{ {
CompilerParameters compilerParams = new CompilerParameters(); CompilerParameters compilerParams = new CompilerParameters();
CompilerResults compilerResults; CompilerResults compilerResults;
@ -96,7 +96,7 @@ namespace OpenSim.Region.Enviorment.Scripting
public Dictionary<string,IScript> compile(string filename) public Dictionary<string,IScript> compile(string filename)
{ {
CSharpCodeProvider csharpProvider = new CSharpCodeProvider(); CSharpCodeProvider csharpProvider = new CSharpCodeProvider();
return LoadDotNetScript(csharpProvider.CreateCompiler(), filename); return LoadDotNetScript(csharpProvider, filename);
} }
} }
} }

4
OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
View File

@ -40,7 +40,7 @@ namespace OpenSim.Region.Enviorment.Scripting
return ".js"; return ".js";
} }
private Dictionary<string, IScript> LoadDotNetScript(ICodeCompiler compiler, string filename) private Dictionary<string, IScript> LoadDotNetScript(CodeDomProvider compiler, string filename)
{ {
CompilerParameters compilerParams = new CompilerParameters(); CompilerParameters compilerParams = new CompilerParameters();
CompilerResults compilerResults; CompilerResults compilerResults;
@ -96,7 +96,7 @@ namespace OpenSim.Region.Enviorment.Scripting
public Dictionary<string, IScript> compile(string filename) public Dictionary<string, IScript> compile(string filename)
{ {
JScriptCodeProvider jscriptProvider = new JScriptCodeProvider(); JScriptCodeProvider jscriptProvider = new JScriptCodeProvider();
return LoadDotNetScript(jscriptProvider.CreateCompiler(), filename); return LoadDotNetScript(jscriptProvider, filename);
} }
} }
} }

6
OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
View File

@ -63,7 +63,7 @@ namespace OpenSim.Region.Terrain
{ {
public Dictionary<string, ITerrainFilter> filters = new Dictionary<string, ITerrainFilter>(); public Dictionary<string, ITerrainFilter> filters = new Dictionary<string, ITerrainFilter>();
private void LoadFilter(ICodeCompiler compiler, string filename) private void LoadFilter(CodeDomProvider compiler, string filename)
{ {
CompilerParameters compilerParams = new CompilerParameters(); CompilerParameters compilerParams = new CompilerParameters();
CompilerResults compilerResults; CompilerResults compilerResults;
@ -114,13 +114,13 @@ namespace OpenSim.Region.Terrain
public void LoadFilterCSharp(string filename) public void LoadFilterCSharp(string filename)
{ {
CSharpCodeProvider compiler = new CSharpCodeProvider(); CSharpCodeProvider compiler = new CSharpCodeProvider();
LoadFilter(compiler.CreateCompiler(), filename); LoadFilter(compiler, filename);
} }
public void LoadFilterJScript(string filename) public void LoadFilterJScript(string filename)
{ {
JScriptCodeProvider compiler = new JScriptCodeProvider(); JScriptCodeProvider compiler = new JScriptCodeProvider();
LoadFilter(compiler.CreateCompiler(), filename); LoadFilter(compiler, filename);
} }
} }
} }