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

Cut down on the number of compile warnings. Now down to 5: 4 are related to unused events on IClientAPI and 1 is a unused variable in LSL_BuiltIn_Commands (which I'll leave to Tedd, as he will know if it will be used in the future or not).

afrisby
MW 2007-09-08 08:12:19 +00:00
parent c29df824c2
commit 5020e4e602
4 changed files with 18 additions and 11 deletions
OpenSim/Region
Environment
ScriptEngine/DotNetEngine

13
OpenSim/Region/Environment/Modules/ChatModule.cs
View File

@ -20,24 +20,27 @@ namespace OpenSim.Region.Environment.Modules
private string m_server = "irc2.choopa.net"; private string m_server = "irc2.choopa.net";
private int m_port = 6668; // private int m_port = 6668;
private string m_user = "USER OpenSimBot 8 * :I'm a OpenSim to irc bot"; //private string m_user = "USER OpenSimBot 8 * :I'm a OpenSim to irc bot";
private string m_nick = "OSimBot"; private string m_nick = "OSimBot";
private string m_channel = "#opensim"; private string m_channel = "#opensim";
private NetworkStream m_stream; // private NetworkStream m_stream;
private TcpClient m_irc; private TcpClient m_irc;
private StreamWriter m_ircWriter; private StreamWriter m_ircWriter;
private StreamReader m_ircReader; private StreamReader m_ircReader;
private Thread pingSender; // private Thread pingSender;
private Thread listener; // private Thread listener;
private bool connected = false; private bool connected = false;
public ChatModule() public ChatModule()
{ {
m_nick = "OSimBot" + Util.RandomClass.Next(1, 99); m_nick = "OSimBot" + Util.RandomClass.Next(1, 99);
m_irc = null;
m_ircWriter = null;
m_ircReader = null;
} }
public void Initialise(Scene scene) public void Initialise(Scene scene)

7
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment.Scenes
public delegate void SignificantClientMovement(IClientAPI remote_client); public delegate void SignificantClientMovement(IClientAPI remote_client);
public event SignificantClientMovement OnSignificantClientMovement; public event SignificantClientMovement OnSignificantClientMovement;
public List<SceneObjectGroup> InterestList = new List<SceneObjectGroup>(); //public List<SceneObjectGroup> InterestList = new List<SceneObjectGroup>();
// private Queue<SceneObjectGroup> m_fullGroupUpdates = new Queue<SceneObjectGroup>(); // private Queue<SceneObjectGroup> m_fullGroupUpdates = new Queue<SceneObjectGroup>();
// private Queue<SceneObjectGroup> m_terseGroupUpdates = new Queue<SceneObjectGroup>(); // private Queue<SceneObjectGroup> m_terseGroupUpdates = new Queue<SceneObjectGroup>();
@ -198,6 +198,11 @@ namespace OpenSim.Region.Environment.Scenes
//temporary until we move some code into the body classes //temporary until we move some code into the body classes
this.m_body = new ChildAgent(); this.m_body = new ChildAgent();
if (newAvatar)
{
//do we need to use newAvatar? not sure so have added this to kill the compile warning
}
} }
#endregion #endregion

4
OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
View File

@ -108,7 +108,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
EventQueueThread.Abort(); EventQueueThread.Abort();
EventQueueThread.Join(); EventQueueThread.Join();
} }
catch (Exception e) catch (Exception)
{ {
//myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Exception killing worker thread: " + e.ToString()); //myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Exception killing worker thread: " + e.ToString());
} }
@ -220,7 +220,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
} }
} // while } // while
} // try } // try
catch (ThreadAbortException tae) catch (ThreadAbortException)
{ {
//myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Worker thread killed: " + tae.Message); //myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Worker thread killed: " + tae.Message);
} }

1
prebuild.xml
View File

@ -800,7 +800,6 @@
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Servers"/> <Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Data"/> <Reference name="OpenSim.Framework.Data"/>
<Reference name="OpenSim.Grid.Framework.Manager"/>
<Reference name="libsecondlife.dll"/> <Reference name="libsecondlife.dll"/>
<Reference name="Db4objects.Db4o.dll"/> <Reference name="Db4objects.Db4o.dll"/>
<Reference name="XMLRPC.dll"/> <Reference name="XMLRPC.dll"/>