From 5c766c2bf53578feeb6bffa55c316e1ffc1b57ec Mon Sep 17 00:00:00 2001 From: Date: Sat, 2 Aug 2008 07:12:51 +0000 Subject: [PATCH] LIBOMV-344 Cleaned up OpenMetaverse.GUI code a little git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@2050 52acb1d6-8a22-11de-b505-999d5b087335 --- OpenMetaverse.GUI/AvatarList.cs | 1 + OpenMetaverse.GUI/InventoryTree.cs | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/OpenMetaverse.GUI/AvatarList.cs b/OpenMetaverse.GUI/AvatarList.cs index df777f9b..6e0101fb 100644 --- a/OpenMetaverse.GUI/AvatarList.cs +++ b/OpenMetaverse.GUI/AvatarList.cs @@ -171,6 +171,7 @@ namespace OpenMetaverse.GUI if (_Avatars.Contains(objectID)) RemoveAvatar(objectID); } } + } } diff --git a/OpenMetaverse.GUI/InventoryTree.cs b/OpenMetaverse.GUI/InventoryTree.cs index 4b8c3437..615a8925 100644 --- a/OpenMetaverse.GUI/InventoryTree.cs +++ b/OpenMetaverse.GUI/InventoryTree.cs @@ -52,7 +52,7 @@ namespace OpenMetaverse.GUI /// public InventoryTree() { - this.BeforeExpand += new TreeViewCancelEventHandler(this_BeforeExpand); + this.BeforeExpand += new TreeViewCancelEventHandler(InventoryTree_BeforeExpand); } /// @@ -144,22 +144,23 @@ namespace OpenMetaverse.GUI _Client.Network.OnLogin += new NetworkManager.LoginCallback(Network_OnLogin); } - private void this_BeforeExpand(object sender, TreeViewCancelEventArgs e) + private void Inventory_OnFolderUpdated(UUID folderID) + { + UpdateFolder(folderID); + } + + private void InventoryTree_BeforeExpand(object sender, TreeViewCancelEventArgs e) { UUID folderID; if (e.Node.Name != null && UUID.TryParse(e.Node.Name, out folderID)) _Client.Inventory.RequestFolderContents(folderID, _Client.Self.AgentID, true, true, InventorySortOrder.FoldersByName); } - private void Inventory_OnFolderUpdated(UUID folderID) - { - UpdateFolder(folderID); - } - private void Network_OnLogin(LoginStatus login, string message) { if (login == LoginStatus.Success) Client.Inventory.RequestFolderContents(Client.Inventory.Store.RootFolder.UUID, Client.Self.AgentID, true, true, InventorySortOrder.FoldersByName); } + } }