Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Adding a try/catch to GroupRoleMembersHandler as a hacky workaround to some NullReferenceExceptions I've had there

Browse Source 
* Removing any of the (now irrelevant) outbound throttling code
* Adding another SendPacket() overload

git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@1318 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2007-07-18 04:02:50 +00:00
parent f20dc4cb8f
commit ed1f663217
3 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
libsecondlife/Simulator.cs
View File

@@ -557,8 +557,6 @@ namespace libsecondlife
/// should be modified to the current stream sequence number</param>
public void SendPacket(byte[] payload, bool setSequence)
{
if (Client.Settings.OUTBOUND_THROTTLE) DoThrottle();
try
{
if (setSequence && payload.Length > 3)
@@ -583,12 +581,27 @@ namespace libsecondlife
}
catch (SocketException)
{
Client.Log("Tried to send a " + payload.Length + " byte payload on a closed socket, shutting down " +
this.ToString(), Helpers.LogLevel.Info);
Client.Log("Tried to send a " + payload.Length +
" byte payload on a closed socket, shutting down " + this.ToString(),
Helpers.LogLevel.Info);
Network.DisconnectSim(this);
return;
}
catch (Exception e)
{
Client.Log(e.ToString(), Helpers.LogLevel.Error);
}
}
/// <summary>
/// Send a prepared <code>UDPPacketBuffer</code> object as a packet
/// </summary>
/// <param name="buffer">The prepared packet structure to be sent out</param>
public void SendPacket(UDPPacketBuffer buffer)
{
try { AsyncBeginSend(buffer); }
catch (Exception e) { Client.Log(e.ToString(), Helpers.LogLevel.Error); }
}
/// <summary>
@@ -720,22 +733,6 @@ namespace libsecondlife
{
}
private void DoThrottle()
{
int throttle;
if (OutgoingBPS > Client.Settings.OUTBOUND_THROTTLE_RATE)
{
throttle = (int)((OutgoingBPS - Client.Settings.OUTBOUND_THROTTLE_RATE) * 2000 /
Client.Settings.OUTBOUND_THROTTLE_RATE);
Client.DebugLog(String.Format("Simulator {0} throttling for {1}ms", this.ToString(), throttle));
// FIXME: When the outgoing message pumps are in place we won't need to throttle by locking up
// the application
Thread.Sleep(throttle);
}
}
/// <summary>
/// Sends out pending acknowledgements
/// </summary>