Recently, libsl was changed, removing the Circuit class in favor of
the Simulator class
I created a patch to fix these errors throughout the entire libsl tree.
I can commit once verified.
--
--Jesse
Index: libsecondlife-cs/Inventory/Inventory/InventorySystem/InventoryManager.cs
===================================================================
--- libsecondlife-cs/Inventory/Inventory/InventorySystem/InventoryManager.cs (revision 90)
+++ libsecondlife-cs/Inventory/Inventory/InventorySystem/InventoryManager.cs (working copy)
@@ -362,7 +362,7 @@
0630 Type (S8 / 1)
1025 FolderID (LLUUID / 1)
*/
- public void InventoryDescendentsHandler(Packet packet, Circuit circuit)
+ public void InventoryDescendentsHandler(Packet packet, Simulator simulator)
{
// Console.WriteLine("Status|Queue :: " + htFolderDownloadStatus.Count + "/" + qFolderRequestQueue.Count);
iLastPacketRecieved = getUnixtime();
Index: libsecondlife-cs/Inventory/Inventory/AssetSystem/AssetManager.cs
===================================================================
--- libsecondlife-cs/Inventory/Inventory/AssetSystem/AssetManager.cs (revision 90)
+++ libsecondlife-cs/Inventory/Inventory/AssetSystem/AssetManager.cs (working copy)
@@ -112,7 +112,7 @@
}
- public void AssetUploadCompleteCallbackHandler(Packet packet, Circuit circuit)
+ public void AssetUploadCompleteCallbackHandler(Packet packet, Simulator simulator)
{
ArrayList blocks = packet.Blocks();
@@ -172,7 +172,7 @@
1062 Status (S32 / 1)
*/
- public void TransferInfoCallbackHandler(Packet packet, Circuit circuit)
+ public void TransferInfoCallbackHandler(Packet packet, Simulator simulator)
{
ArrayList blocks = packet.Blocks();
@@ -243,7 +243,7 @@
Status: 1
*/
- public void TransferPacketCallbackHandler(Packet packet, Circuit circuit)
+ public void TransferPacketCallbackHandler(Packet packet, Simulator simulator)
{
LLUUID TransferID = "";
byte[] Data = null;
@@ -295,7 +295,7 @@
*/
- public void ConfirmXferPacketCallbackHandler(Packet packet, Circuit circuit)
+ public void ConfirmXferPacketCallbackHandler(Packet packet, Simulator simulator)
{
U64 XferID = new U64();
uint PacketNum = 0;
@@ -344,7 +344,7 @@
VFileID: b16097032e253a9d5220ba07c1a1b28a
VFileType: 7
*/
- public void RequestXferCallbackHandler(Packet packet, Circuit circuit)
+ public void RequestXferCallbackHandler(Packet packet, Simulator simulator)
{
U64 XferID = new U64();
LLUUID AssetID = "";
Index: applications/SecondSuite/Plugins/Accountant/frmAccountant.cs
===================================================================
--- applications/SecondSuite/Plugins/Accountant/frmAccountant.cs (revision 90)
+++ applications/SecondSuite/Plugins/Accountant/frmAccountant.cs (working copy)
@@ -88,7 +88,7 @@
Client.Network.SendPacket(packet);
}
- private void BalanceHandler(Packet packet, Circuit circuit)
+ private void BalanceHandler(Packet packet, Simulator simulator)
{
if (packet.Layout.Name == "MoneyBalanceReply")
{
@@ -130,7 +130,7 @@
}
}
- private void DirPeopleHandler(Packet packet, Circuit circuit)
+ private void DirPeopleHandler(Packet packet, Simulator simulator)
{
lstFindMutex.WaitOne();
Index: applications/SecondSuite/Plugins/PrimImporter/frmPrimImporter.cs
===================================================================
--- applications/SecondSuite/Plugins/PrimImporter/frmPrimImporter.cs (revision 90)
+++ applications/SecondSuite/Plugins/PrimImporter/frmPrimImporter.cs (working copy)
@@ -41,7 +41,7 @@
Client.Network.RegisterCallback("ObjectUpdate", new PacketCallback(ObjectUpdateHandler));
}
- public void ObjectAddHandler(Packet packet, Circuit circuit)
+ public void ObjectAddHandler(Packet packet, Simulator simulator)
{
LLVector3 position = null;
@@ -67,7 +67,7 @@
}
}
- public void ObjectUpdateHandler(Packet packet, Circuit circuit)
+ public void ObjectUpdateHandler(Packet packet, Simulator simulator)
{
uint id = 0;
LLUUID uuid = null;
Index: applications/SecondSuite/Plugins/PrimBuilder/frmPrimBuilder.cs
===================================================================
--- applications/SecondSuite/Plugins/PrimBuilder/frmPrimBuilder.cs (revision 90)
+++ applications/SecondSuite/Plugins/PrimBuilder/frmPrimBuilder.cs (working copy)
@@ -102,7 +102,7 @@
Client.Network.RegisterCallback("CoarseLocationUpdate", new PacketCallback(LocationHandler));
}
- private void LocationHandler(Packet packet, Circuit circuit)
+ private void LocationHandler(Packet packet, Simulator simulator)
{
if (numPositionX.Value == 0)
{
_______________________________________________
libsecondlife-dev mailing list
[email protected]
https://mail.gna.org/listinfo/libsecondlife-dev
