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

* Transfer timeout support for uploads. This code will be deprecated soon though as CAPS uploading is almost finished

Browse Source 
* More parameters to HTTPBase and Capabilities for making special requests
* Renamed InventoryManager callbacks to match the rest of libsecondlife
* Several new InventoryManager functions, not complete yet!
* Fix for null buddy list on login
* OnSimConnecting returns a bool to allow canceling sim connections
* NetworkManager.Connect() properly returns null on a failure

git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@1393 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2007-09-10 10:20:30 +00:00
parent 9dccf908da
commit 62dddabd7c
12 changed files with 986 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libsecondlife/NetworkManager.cs
View File

@@ -102,7 +102,9 @@ namespace libsecondlife
/// <remarks>The connection to the new simulator won't be established
/// until this callback returns</remarks>
/// <param name="simulator">The simulator that is being connected to</param>
public delegate void SimConnectingCallback(Simulator simulator);
/// <returns>Whether to continue connecting to the simulator or abort
/// the connection</returns>
public delegate bool SimConnectingCallback(Simulator simulator);
/// <summary>
/// Triggered when a new connection to a simulator is established
/// </summary>
@@ -370,11 +372,19 @@ namespace libsecondlife
// Fire the OnSimConnecting event
if (OnSimConnecting != null)
{
try { OnSimConnecting(simulator); }
try
{
if (!OnSimConnecting(simulator))
{
// Callback is requesting that we abort this connection
lock (Simulators) Simulators.Remove(simulator);
return null;
}
}
catch (Exception e) { Client.Log(e.ToString(), Helpers.LogLevel.Error); }
}
// We're not connected to this simulator, attempt to establish a connection
// Attempt to establish a connection to the simulator
if (simulator.Connect(setDefault))
{
// Start a timer that checks if we've been disconnected
@@ -391,11 +401,14 @@ namespace libsecondlife
// If enabled, send an AgentThrottle packet to the server to increase our bandwidth
if (Client.Settings.SEND_AGENT_THROTTLE) Client.Throttle.Set(simulator);
return simulator;
}
else
{
// Connection failed, so remove this simulator from our list and destroy it
// Connection failed, remove this simulator from our list and destroy it
lock (Simulators) Simulators.Remove(simulator);
return null;
}
}
else if (setDefault)
@@ -409,9 +422,15 @@ namespace libsecondlife
// Send an initial AgentUpdate to complete our movement in to the sim
if (Client.Settings.SEND_AGENT_UPDATES)
Client.Self.Status.SendUpdate(true, simulator);
}
return simulator;
return simulator;
}
else
{
// Already connected to this simulator and wasn't asked to set it as the default,
// just return a reference to the existing object
return simulator;
}
}
/// <summary>