Start of a redesign of SimClient (now renamed ClientView)/World/Avatar/Prim , switching to a event based system (World/Avatar register as event handlers). It is possible that I've broke something with this commit but it doesn't matter as I'll just hide and no one will find me.

2 files changed, 13 insertions, 13 deletions

diff --git a/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim.RegionServer/Assets/AssetCache.cs
index e8bf292..ccebb24 100644
--- a/OpenSim.RegionServer/Assets/AssetCache.cs
+++ b/OpenSim.RegionServer/Assets/AssetCache.cs
@@ -324,7 +324,7 @@ namespace OpenSim.Assets
         /// </summary>

         /// <param name="userInfo"></param>

         /// <param name="transferRequest"></param>

-        public void AddAssetRequest(SimClient userInfo, TransferRequestPacket transferRequest)

+        public void AddAssetRequest(ClientView userInfo, TransferRequestPacket transferRequest)

         {

             LLUUID requestID = new LLUUID(transferRequest.TransferInfo.Params, 0);

             //check to see if asset is in local cache, if not we need to request it from asset server.

@@ -464,7 +464,7 @@ namespace OpenSim.Assets
         /// </summary>

         /// <param name="userInfo"></param>

         /// <param name="imageID"></param>

-        public void AddTextureRequest(SimClient userInfo, LLUUID imageID)

+        public void AddTextureRequest(ClientView userInfo, LLUUID imageID)

         {

             //check to see if texture is in local cache, if not request from asset server

             if (!this.Textures.ContainsKey(imageID))

@@ -517,7 +517,7 @@ namespace OpenSim.Assets
 

     public class AssetRequest

     {

-        public SimClient RequestUser;

+        public ClientView RequestUser;

         public LLUUID RequestAssetID;

         public AssetInfo AssetInf;

         public TextureImage ImageInfo;

diff --git a/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim.RegionServer/Assets/InventoryCache.cs
index 136ae53..64a7a32 100644
--- a/OpenSim.RegionServer/Assets/InventoryCache.cs
+++ b/OpenSim.RegionServer/Assets/InventoryCache.cs
@@ -94,12 +94,12 @@ namespace OpenSim.Assets
             }

         }

 

-        public bool CreateNewInventoryFolder(SimClient remoteClient, LLUUID folderID)

+        public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID)

         {

             return this.CreateNewInventoryFolder(remoteClient, folderID, 0);

         }

 

-        public bool CreateNewInventoryFolder(SimClient remoteClient, LLUUID folderID, ushort type)

+        public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID, ushort type)

         {

             bool res = false;

             if (folderID != LLUUID.Zero)  //don't create a folder with a zero id

@@ -112,7 +112,7 @@ namespace OpenSim.Assets
             return res;

         }

 

-        public bool CreateNewInventoryFolder(SimClient remoteClient, LLUUID folderID, ushort type, string folderName, LLUUID parent)

+        public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID, ushort type, string folderName, LLUUID parent)

         {

             bool res = false;

             if (folderID != LLUUID.Zero)  //don't create a folder with a zero id

@@ -125,7 +125,7 @@ namespace OpenSim.Assets
             return res;

         }

 

-        public LLUUID AddNewInventoryItem(SimClient remoteClient, LLUUID folderID, OpenSim.Framework.Types.AssetBase asset)

+        public LLUUID AddNewInventoryItem(ClientView remoteClient, LLUUID folderID, OpenSim.Framework.Types.AssetBase asset)

         {

             LLUUID newItem = null;

             if (this._agentsInventory.ContainsKey(remoteClient.AgentID))

@@ -140,7 +140,7 @@ namespace OpenSim.Assets
 

             return newItem;

         }

-        public bool DeleteInventoryItem(SimClient remoteClient, LLUUID itemID)

+        public bool DeleteInventoryItem(ClientView remoteClient, LLUUID itemID)

         {

             bool res = false;

             if (this._agentsInventory.ContainsKey(remoteClient.AgentID))

@@ -161,7 +161,7 @@ namespace OpenSim.Assets
             return res;

         }

 

-        public bool UpdateInventoryItemAsset(SimClient remoteClient, LLUUID itemID, OpenSim.Framework.Types.AssetBase asset)

+        public bool UpdateInventoryItemAsset(ClientView remoteClient, LLUUID itemID, OpenSim.Framework.Types.AssetBase asset)

         {

             if (this._agentsInventory.ContainsKey(remoteClient.AgentID))

             {

@@ -177,7 +177,7 @@ namespace OpenSim.Assets
             return false;

         }

 

-        public bool UpdateInventoryItemDetails(SimClient remoteClient, LLUUID itemID, UpdateInventoryItemPacket.InventoryDataBlock packet)

+        public bool UpdateInventoryItemDetails(ClientView remoteClient, LLUUID itemID, UpdateInventoryItemPacket.InventoryDataBlock packet)

         {

             if (this._agentsInventory.ContainsKey(remoteClient.AgentID))

             {

@@ -193,7 +193,7 @@ namespace OpenSim.Assets
             return false;

         }

 

-        public void FetchInventoryDescendents(SimClient userInfo, FetchInventoryDescendentsPacket FetchDescend)

+        public void FetchInventoryDescendents(ClientView userInfo, FetchInventoryDescendentsPacket FetchDescend)

         {

             if (this._agentsInventory.ContainsKey(userInfo.AgentID))

             {

@@ -250,7 +250,7 @@ namespace OpenSim.Assets
             }

         }

 

-        public void FetchInventory(SimClient userInfo, FetchInventoryPacket FetchItems)

+        public void FetchInventory(ClientView userInfo, FetchInventoryPacket FetchItems)

         {

             if (this._agentsInventory.ContainsKey(userInfo.AgentID))

             {

@@ -291,7 +291,7 @@ namespace OpenSim.Assets
             }

         }

 

-        private void SendItemUpdateCreate(SimClient remoteClient, InventoryItem Item)

+        private void SendItemUpdateCreate(ClientView remoteClient, InventoryItem Item)

         {

 

             UpdateCreateInventoryItemPacket InventoryReply = new UpdateCreateInventoryItemPacket();