More event arg changes

git-svn-id: https://radegast.googlecode.com/svn/trunk@359 f7a694da-4d33-11de-9ad6-1127a62b9fcd

diff --git a/Radegast/Core/RadegastInstance.cs b/Radegast/Core/RadegastInstance.cs
index 6fb97bc..0386e72 100644 (file)
--- a/Radegast/Core/RadegastInstance.cs
+++ b/Radegast/Core/RadegastInstance.cs
@@ -200,7 +200,7 @@ namespace Radegast
             client.Groups.GroupLeaveReply += new EventHandler<GroupOperationEventArgs>(Groups_GroupsChanged);\r
             client.Groups.GroupDropped += new EventHandler<GroupDroppedEventArgs>(Groups_GroupsChanged);\r
             client.Groups.GroupJoinedReply += new EventHandler<GroupOperationEventArgs>(Groups_GroupsChanged);\r
-            client.Avatars.OnAvatarNames += new AvatarManager.AvatarNamesCallback(Avatars_OnAvatarNames);\r
+            client.Avatars.UUIDNameReply += new EventHandler<UUIDNameReplyEventArgs>(Avatars_UUIDNameReply);\r
             client.Network.OnConnected += new NetworkManager.ConnectedCallback(Network_OnConnected);\r
             mainForm.Load += new EventHandler(mainForm_Load);\r
             ScanAndLoadPlugins();\r
@@ -214,7 +214,7 @@ namespace Radegast
                 client.Groups.GroupLeaveReply -= new EventHandler<GroupOperationEventArgs>(Groups_GroupsChanged);\r
                 client.Groups.GroupDropped -= new EventHandler<GroupDroppedEventArgs>(Groups_GroupsChanged);\r
                 client.Groups.GroupJoinedReply -= new EventHandler<GroupOperationEventArgs>(Groups_GroupsChanged);\r
-                client.Avatars.OnAvatarNames -= new AvatarManager.AvatarNamesCallback(Avatars_OnAvatarNames);\r
+                client.Avatars.UUIDNameReply -= new EventHandler<UUIDNameReplyEventArgs>(Avatars_UUIDNameReply);\r
                 client.Network.OnConnected -= new NetworkManager.ConnectedCallback(Network_OnConnected);\r
             }\r
 \r
@@ -392,11 +392,12 @@ namespace Radegast
             clientSettings = new Settings(Path.Combine(ClientDir, "client_settings.xml"));\r
         }\r
 \r
-        void Avatars_OnAvatarNames(Dictionary<UUID, string> names)\r
+\r
+        void Avatars_UUIDNameReply(object sender, UUIDNameReplyEventArgs e)\r
         {\r
             lock (nameCache)\r
             {\r
-                foreach (KeyValuePair<UUID, string> av in names)\r
+                foreach (KeyValuePair<UUID, string> av in e.Names)\r
                 {\r
                     if (!nameCache.ContainsKey(av.Key))\r
                     {\r

diff --git a/Radegast/Core/Types/AgentNameTextBox.cs b/Radegast/Core/Types/AgentNameTextBox.cs
index decfcd6..334c5b0 100644 (file)
--- a/Radegast/Core/Types/AgentNameTextBox.cs
+++ b/Radegast/Core/Types/AgentNameTextBox.cs
@@ -82,7 +82,7 @@ namespace Radegast
         {\r
             if (client != null)\r
             {\r
-                client.Avatars.OnAvatarNames += new AvatarManager.AvatarNamesCallback(Avatars_OnAvatarNames);\r
+                client.Avatars.UUIDNameReply += new EventHandler<UUIDNameReplyEventArgs>(Avatars_UUIDNameReply);\r
             }\r
         }\r
 \r
@@ -90,16 +90,16 @@ namespace Radegast
         {\r
             if (client != null)\r
             {\r
-                client.Avatars.OnAvatarNames -= new AvatarManager.AvatarNamesCallback(Avatars_OnAvatarNames);\r
+                client.Avatars.UUIDNameReply -= new EventHandler<UUIDNameReplyEventArgs>(Avatars_UUIDNameReply);\r
             }\r
         }\r
 \r
-        void Avatars_OnAvatarNames(Dictionary<UUID, string> names)\r
+        void Avatars_UUIDNameReply(object sender, UUIDNameReplyEventArgs e)\r
         {\r
-            if (names.ContainsKey(agentID))\r
+            if (e.Names.ContainsKey(agentID))\r
             {\r
                 CleanupHandlers(null, null);\r
-                SetName(names[agentID]);\r
+                SetName(e.Names[agentID]);\r
             }\r
         }\r
 \r

diff --git a/Radegast/GUI/Consoles/AnimTab.cs b/Radegast/GUI/Consoles/AnimTab.cs
index 945a925..777c451 100644 (file)
--- a/Radegast/GUI/Consoles/AnimTab.cs
+++ b/Radegast/GUI/Consoles/AnimTab.cs
@@ -55,37 +55,34 @@ namespace Radegast
             this.client = instance.Client;\r
 \r
             // Callbacks\r
-            client.Avatars.OnAvatarAnimation += new AvatarManager.AvatarAnimationCallback(Avatars_OnAvatarAnimationUpdate);\r
+            client.Avatars.AvatarAnimation += new EventHandler<AvatarAnimationEventArgs>(Avatars_AvatarAnimation);\r
         }\r
 \r
         void AnimTab_Disposed(object sender, EventArgs e)\r
         {\r
-            client.Avatars.OnAvatarAnimation -= new AvatarManager.AvatarAnimationCallback(Avatars_OnAvatarAnimationUpdate);\r
+            client.Avatars.AvatarAnimation -= new EventHandler<AvatarAnimationEventArgs>(Avatars_AvatarAnimation);\r
         }\r
 \r
-        void Avatars_OnAvatarAnimationUpdate(UUID avatarID, InternalDictionary<UUID, int> anims)\r
+        void Avatars_AvatarAnimation(object sender, AvatarAnimationEventArgs e)\r
         {\r
             if (InvokeRequired) {\r
-                Invoke(new MethodInvoker(delegate()\r
-                {\r
-                    Avatars_OnAvatarAnimationUpdate(avatarID, anims);\r
-                }));\r
+                Invoke(new MethodInvoker(() => Avatars_AvatarAnimation(sender, e)));\r
                 return;\r
             }\r
-            if (avatarID == av.ID)\r
+            if (e.AvatarID== av.ID)\r
             {\r
-                anims.ForEach(delegate(UUID AnimID)\r
+                foreach (Animation a in e.Animations)\r
                 {\r
-                    if (!seenAnim.Contains(AnimID))\r
+                    if (!seenAnim.Contains(a.AnimationID))\r
                     {\r
-                        Logger.Log("New anim for " + av.Name + ": " + AnimID, Helpers.LogLevel.Debug);\r
-                        seenAnim.Add(AnimID);\r
-                        AnimDetail ad = new AnimDetail(instance, av, AnimID, n);\r
+                        Logger.Log("New anim for " + av.Name + ": " + a.AnimationID, Helpers.LogLevel.Debug);\r
+                        seenAnim.Add(a.AnimationID);\r
+                        AnimDetail ad = new AnimDetail(instance, av, a.AnimationID, n);\r
                         ad.Location = new Point(0, n++ * ad.Height);\r
                         ad.Dock = DockStyle.Top;\r
                         Controls.Add(ad);\r
                     }\r
-                });\r
+                }\r
             }\r
         }\r
 \r
@@ -99,6 +96,5 @@ namespace Radegast
                 }\r
             }\r
         }\r
-\r
     }\r
 }\r

diff --git a/Radegast/GUI/Consoles/FriendsConsole.cs b/Radegast/GUI/Consoles/FriendsConsole.cs
index a63d4ec..79a707f 100644 (file)
--- a/Radegast/GUI/Consoles/FriendsConsole.cs
+++ b/Radegast/GUI/Consoles/FriendsConsole.cs
@@ -145,22 +145,22 @@ namespace Radegast
                     ManualResetEvent done = new ManualResetEvent(false);\r
                     {\r
 \r
-                        AvatarManager.AvatarNamesCallback callback = delegate(Dictionary<UUID, string> names)\r
+                        EventHandler<UUIDNameReplyEventArgs> callback = delegate(object senderx, UUIDNameReplyEventArgs ex)\r
                         {\r
-                            if (names.ContainsKey(e.Friend.UUID))\r
+                            if (ex.Names.ContainsKey(e.Friend.UUID))\r
                             {\r
-                                name = names[e.Friend.UUID];\r
+                                name = ex.Names[e.Friend.UUID];\r
                                 done.Set();\r
                             }\r
                         };\r
 \r
-                        client.Avatars.OnAvatarNames += callback;\r
+                        client.Avatars.UUIDNameReply += callback;\r
                         name = instance.getAvatarName(e.Friend.UUID);\r
                         if (name == RadegastInstance.INCOMPLETE_NAME)\r
                         {\r
                             done.WaitOne(3000, false);\r
                         }\r
-                        client.Avatars.OnAvatarNames -= callback;\r
+                        client.Avatars.UUIDNameReply -= callback;\r
                     }\r
                 }\r
 \r
@@ -179,22 +179,22 @@ namespace Radegast
                 using (ManualResetEvent done = new ManualResetEvent(false))\r
                 {\r
 \r
-                    AvatarManager.AvatarNamesCallback callback = delegate(Dictionary<UUID, string> names)\r
+                    EventHandler<UUIDNameReplyEventArgs> callback = delegate(object senderx, UUIDNameReplyEventArgs ex)\r
                     {\r
-                        if (names.ContainsKey(e.AgentID))\r
+                        if (ex.Names.ContainsKey(e.AgentID))\r
                         {\r
-                            agentName = names[e.AgentID];\r
+                            agentName = ex.Names[e.AgentID];\r
                             done.Set();\r
                         }\r
                     };\r
 \r
-                    client.Avatars.OnAvatarNames += callback;\r
+                    client.Avatars.UUIDNameReply += callback;\r
                     agentName = instance.getAvatarName(e.AgentID);\r
                     if (agentName == RadegastInstance.INCOMPLETE_NAME)\r
                     {\r
                         done.WaitOne(3000, false);\r
                     }\r
-                    client.Avatars.OnAvatarNames -= callback;\r
+                    client.Avatars.UUIDNameReply -= callback;\r
                 }\r
             }\r
 \r

diff --git a/Radegast/GUI/Consoles/GroupDetails.cs b/Radegast/GUI/Consoles/GroupDetails.cs
index 3513c44..1f1724a 100644 (file)
--- a/Radegast/GUI/Consoles/GroupDetails.cs
+++ b/Radegast/GUI/Consoles/GroupDetails.cs
@@ -75,8 +75,7 @@ namespace Radegast
             client.Groups.CurrentGroups += new EventHandler<CurrentGroupsEventArgs>(Groups_CurrentGroups);\r
             client.Groups.GroupNoticesListReply += new EventHandler<GroupNoticesListReplyEventArgs>(Groups_GroupNoticesListReply);\r
             client.Self.IM += new EventHandler<InstantMessageEventArgs>(Self_IM);\r
-\r
-            client.Avatars.OnAvatarNames += new AvatarManager.AvatarNamesCallback(Avatars_OnAvatarNames);\r
+            client.Avatars.UUIDNameReply += new EventHandler<UUIDNameReplyEventArgs>(Avatars_UUIDNameReply);\r
 \r
             RefreshControlsAvailability();\r
             RefreshGroupInfo();\r
@@ -90,8 +89,7 @@ namespace Radegast
             client.Groups.CurrentGroups -= new EventHandler<CurrentGroupsEventArgs>(Groups_CurrentGroups);\r
             client.Groups.GroupNoticesListReply -= new EventHandler<GroupNoticesListReplyEventArgs>(Groups_GroupNoticesListReply);\r
             client.Self.IM -= new EventHandler<InstantMessageEventArgs>(Self_IM);\r
-\r
-            client.Avatars.OnAvatarNames -= new AvatarManager.AvatarNamesCallback(Avatars_OnAvatarNames);\r
+            client.Avatars.UUIDNameReply -= new EventHandler<UUIDNameReplyEventArgs>(Avatars_UUIDNameReply);\r
         }\r
 \r
         #region Network callbacks\r
@@ -216,26 +214,22 @@ namespace Radegast
             }\r
         }\r
 \r
-        void Avatars_OnAvatarNames(Dictionary<UUID, string> names)\r
+        void Avatars_UUIDNameReply(object sender, UUIDNameReplyEventArgs e)\r
         {\r
             if (InvokeRequired)\r
             {\r
-                BeginInvoke(new MethodInvoker(delegate()\r
-                    {\r
-                        Avatars_OnAvatarNames(names);\r
-                    }\r
-                ));\r
+                BeginInvoke(new MethodInvoker(() => Avatars_UUIDNameReply(sender, e)));\r
                 return;\r
             }\r
 \r
-            if (names.ContainsKey(group.FounderID))\r
+            if (e.Names.ContainsKey(group.FounderID))\r
             {\r
-                lblFounded.Text = "Founded by: " + names[group.FounderID];\r
+                lblFounded.Text = "Founded by: " + e.Names[group.FounderID];\r
             }\r
 \r
             lvwGeneralMembers.BeginUpdate();\r
             bool modified = false;\r
-            foreach (KeyValuePair<UUID, string> name in names)\r
+            foreach (KeyValuePair<UUID, string> name in e.Names)\r
             {\r
                 if (lvwGeneralMembers.Items.ContainsKey(name.Key.ToString()))\r
                 {\r

diff --git a/Radegast/GUI/Consoles/GroupIMTabWindow.cs b/Radegast/GUI/Consoles/GroupIMTabWindow.cs
index 8d060bb..9b38e9b 100644 (file)
--- a/Radegast/GUI/Consoles/GroupIMTabWindow.cs
+++ b/Radegast/GUI/Consoles/GroupIMTabWindow.cs
@@ -66,7 +66,7 @@ namespace Radegast
             client.Self.GroupChatJoined += new EventHandler<GroupChatJoinedEventArgs>(Self_GroupChatJoined);\r
             client.Self.ChatSessionMemberAdded += new EventHandler<ChatSessionMemberAddedEventArgs>(Self_ChatSessionMemberAdded);\r
             client.Self.ChatSessionMemberLeft += new EventHandler<ChatSessionMemberLeftEventArgs>(Self_ChatSessionMemberLeft);\r
-            client.Avatars.OnAvatarNames += new AvatarManager.AvatarNamesCallback(Avatars_OnAvatarNames);\r
+            client.Avatars.UUIDNameReply += new EventHandler<UUIDNameReplyEventArgs>(Avatars_UUIDNameReply);\r
             client.Self.RequestJoinGroupChat(session);\r
         }\r
 \r
@@ -76,15 +76,15 @@ namespace Radegast
             client.Self.GroupChatJoined -= new EventHandler<GroupChatJoinedEventArgs>(Self_GroupChatJoined);\r
             client.Self.ChatSessionMemberAdded -= new EventHandler<ChatSessionMemberAddedEventArgs>(Self_ChatSessionMemberAdded);\r
             client.Self.ChatSessionMemberLeft -= new EventHandler<ChatSessionMemberLeftEventArgs>(Self_ChatSessionMemberLeft);\r
-            client.Avatars.OnAvatarNames -= new AvatarManager.AvatarNamesCallback(Avatars_OnAvatarNames);\r
+            client.Avatars.UUIDNameReply -= new EventHandler<UUIDNameReplyEventArgs>(Avatars_UUIDNameReply);\r
             CleanUp();\r
         }\r
 \r
-        void Avatars_OnAvatarNames(Dictionary<UUID, string> names)\r
+        void Avatars_UUIDNameReply(object sender, UUIDNameReplyEventArgs e)\r
         {\r
             if (InvokeRequired)\r
             {\r
-                BeginInvoke(new MethodInvoker(() => Avatars_OnAvatarNames(names)));\r
+                BeginInvoke(new MethodInvoker(() => Avatars_UUIDNameReply(sender, e)));\r
                 return;\r
             }\r
 \r
@@ -93,7 +93,7 @@ namespace Radegast
 \r
                 Participants.BeginUpdate();\r
 \r
-                foreach (KeyValuePair<UUID, string> kvp in names)\r
+                foreach (KeyValuePair<UUID, string> kvp in e.Names)\r
                 {\r
                     if (Participants.Items.ContainsKey(kvp.Key.ToString()))\r
                         Participants.Items[kvp.Key.ToString()].Text = kvp.Value;\r

diff --git a/Radegast/GUI/Consoles/MasterTab.cs b/Radegast/GUI/Consoles/MasterTab.cs
index 2d65f0f..5ab3f38 100644 (file)
--- a/Radegast/GUI/Consoles/MasterTab.cs
+++ b/Radegast/GUI/Consoles/MasterTab.cs
@@ -62,14 +62,14 @@ namespace Radegast
             this.avatar = avatar;\r
             \r
             // Callbacks\r
-            client.Avatars.OnPointAt += new AvatarManager.PointAtCallback(Avatars_OnPointAt);\r
+            client.Avatars.ViewerEffectPointAt += new EventHandler<ViewerEffectPointAtEventArgs>(Avatars_ViewerEffectPointAt);\r
             client.Objects.OnObjectProperties += new ObjectManager.ObjectPropertiesCallback(Objects_OnObjectProperties);\r
 \r
         }\r
 \r
         void MasterTab_Disposed(object sender, EventArgs e)\r
         {\r
-            client.Avatars.OnPointAt -= new AvatarManager.PointAtCallback(Avatars_OnPointAt);\r
+            client.Avatars.ViewerEffectPointAt -= new EventHandler<ViewerEffectPointAtEventArgs>(Avatars_ViewerEffectPointAt);\r
             client.Objects.OnObjectProperties -= new ObjectManager.ObjectPropertiesCallback(Objects_OnObjectProperties);\r
         }\r
 \r
@@ -129,12 +129,10 @@ namespace Radegast
             btnPoint.Enabled = true;\r
         }\r
 \r
-\r
-        void Avatars_OnPointAt(UUID sourceID, UUID targetID, Vector3d targetPos,\r
-    PointAtType pointType, float duration, UUID id)\r
+        void Avatars_ViewerEffectPointAt(object sender, ViewerEffectPointAtEventArgs e)\r
         {\r
-            if (sourceID == avatar.ID && targetID != UUID.Zero) {\r
-                selectedID = targetID;\r
+            if (e.SourceID == avatar.ID && e.TargetID != UUID.Zero) {\r
+                selectedID = e.TargetID;\r
                 selectedPrim = client.Network.CurrentSim.ObjectsPrimitives.Find(\r
                     delegate(Primitive prim) { return prim.ID == selectedID; }\r
                 );\r

diff --git a/Radegast/GUI/Consoles/ObjectsConsole.cs b/Radegast/GUI/Consoles/ObjectsConsole.cs
index d0ec436..9722f71 100644 (file)
--- a/Radegast/GUI/Consoles/ObjectsConsole.cs
+++ b/Radegast/GUI/Consoles/ObjectsConsole.cs
@@ -76,7 +76,7 @@ namespace Radegast
             client.Objects.OnObjectKilled += new ObjectManager.KillObjectCallback(Objects_OnObjectKilled);\r
             client.Objects.OnObjectProperties += new ObjectManager.ObjectPropertiesCallback(Objects_OnObjectProperties);\r
             client.Network.OnCurrentSimChanged += new NetworkManager.CurrentSimChangedCallback(Network_OnCurrentSimChanged);\r
-            client.Avatars.OnAvatarNames += new AvatarManager.AvatarNamesCallback(Avatars_OnAvatarNames);\r
+            client.Avatars.UUIDNameReply += new EventHandler<UUIDNameReplyEventArgs>(Avatars_UUIDNameReply);\r
             instance.State.OnWalkStateCanged += new StateManager.WalkStateCanged(State_OnWalkStateCanged);\r
         }\r
 \r
@@ -88,7 +88,7 @@ namespace Radegast
             client.Objects.OnObjectKilled -= new ObjectManager.KillObjectCallback(Objects_OnObjectKilled);\r
             client.Objects.OnObjectProperties -= new ObjectManager.ObjectPropertiesCallback(Objects_OnObjectProperties);\r
             client.Network.OnCurrentSimChanged -= new NetworkManager.CurrentSimChangedCallback(Network_OnCurrentSimChanged);\r
-            client.Avatars.OnAvatarNames -= new AvatarManager.AvatarNamesCallback(Avatars_OnAvatarNames);\r
+            client.Avatars.UUIDNameReply -= new EventHandler<UUIDNameReplyEventArgs>(Avatars_UUIDNameReply);\r
             instance.State.OnWalkStateCanged -= new StateManager.WalkStateCanged(State_OnWalkStateCanged);\r
         }\r
 \r
@@ -139,11 +139,11 @@ namespace Radegast
             btnRefresh_Click(null, null);\r
         }\r
 \r
-        void Avatars_OnAvatarNames(Dictionary<UUID, string> names)\r
+        void Avatars_UUIDNameReply(object sender, UUIDNameReplyEventArgs e)\r
         {\r
             if (InvokeRequired)\r
             {\r
-                BeginInvoke(new MethodInvoker(delegate() { Avatars_OnAvatarNames(names); }));\r
+                BeginInvoke(new MethodInvoker(delegate() { Avatars_UUIDNameReply(sender, e); }));\r
                 return;\r
             }\r
 \r
@@ -153,7 +153,7 @@ namespace Radegast
                 foreach (ListViewItem item in lstPrims.Items)\r
                 {\r
                     Primitive prim = item.Tag as Primitive;\r
-                    if (prim.Properties != null && names.ContainsKey(prim.Properties.OwnerID))\r
+                    if (prim.Properties != null && e.Names.ContainsKey(prim.Properties.OwnerID))\r
                     {\r
                         item.Text = GetObjectName(prim);\r
                     }\r

diff --git a/Radegast/GUI/Dialogs/Pay.cs b/Radegast/GUI/Dialogs/Pay.cs
index a171a7d..e8dbf2b 100644 (file)
--- a/Radegast/GUI/Dialogs/Pay.cs
+++ b/Radegast/GUI/Dialogs/Pay.cs
@@ -68,7 +68,7 @@ namespace Radegast
             // Callbacks\r
             client.Objects.OnPayPriceReply += new ObjectManager.PayPriceReply(Objects_OnPayPriceReply);\r
             client.Objects.OnObjectPropertiesFamily += new ObjectManager.ObjectPropertiesFamilyCallback(Objects_OnObjectPropertiesFamily);\r
-            client.Avatars.OnAvatarNames += new AvatarManager.AvatarNamesCallback(Avatars_OnAvatarNames);\r
+            client.Avatars.UUIDNameReply += new EventHandler<UUIDNameReplyEventArgs>(Avatars_UUIDNameReply);\r
 \r
             if (isObject)\r
             {\r
@@ -88,7 +88,7 @@ namespace Radegast
         {\r
             client.Objects.OnPayPriceReply -= new ObjectManager.PayPriceReply(Objects_OnPayPriceReply);\r
             client.Objects.OnObjectPropertiesFamily -= new ObjectManager.ObjectPropertiesFamilyCallback(Objects_OnObjectPropertiesFamily);\r
-            client.Avatars.OnAvatarNames -= new AvatarManager.AvatarNamesCallback(Avatars_OnAvatarNames);\r
+            client.Avatars.UUIDNameReply -= new EventHandler<UUIDNameReplyEventArgs>(Avatars_UUIDNameReply);\r
         }\r
 \r
         void frmPay_Click(object sender, EventArgs e)\r
@@ -121,11 +121,11 @@ namespace Radegast
             lblResident.Text = string.Format("Pay resident: {0}", instance.getAvatarName(owner));\r
         }\r
 \r
-        void Avatars_OnAvatarNames(Dictionary<UUID, string> names)\r
+        void Avatars_UUIDNameReply(object sender, UUIDNameReplyEventArgs e)\r
         {\r
-            if (names.ContainsKey(owner))\r
+            if (e.Names.ContainsKey(owner))\r
             {\r
-                client.Avatars.OnAvatarNames -= new AvatarManager.AvatarNamesCallback(Avatars_OnAvatarNames);\r
+                client.Avatars.UUIDNameReply -= new EventHandler<UUIDNameReplyEventArgs>(Avatars_UUIDNameReply);\r
                 UpdateResident();\r
             }\r
         }\r

diff --git a/Radegast/GUI/Dialogs/Profile.cs b/Radegast/GUI/Dialogs/Profile.cs
index bdc7e37..6163885 100644 (file)
--- a/Radegast/GUI/Dialogs/Profile.cs
+++ b/Radegast/GUI/Dialogs/Profile.cs
@@ -78,9 +78,9 @@ namespace Radegast
             }\r
 \r
             // Callbacks\r
-            client.Avatars.OnAvatarProperties += new AvatarManager.AvatarPropertiesCallback(Avatars_OnAvatarProperties);\r
-            client.Avatars.OnAvatarPicks += new AvatarManager.AvatarPicksCallback(Avatars_OnAvatarPicks);\r
-            client.Avatars.OnPickInfo += new AvatarManager.PickInfoCallback(Avatars_OnPickInfo);\r
+            client.Avatars.AvatarPropertiesReply += new EventHandler<AvatarPropertiesReplyEventArgs>(Avatars_AvatarPropertiesReply);\r
+            client.Avatars.AvatarPicksReply += new EventHandler<AvatarPicksReplyEventArgs>(Avatars_AvatarPicksReply);\r
+            client.Avatars.PickInfoReply += new EventHandler<PickInfoReplyEventArgs>(Avatars_PickInfoReply);\r
             client.Parcels.ParcelInfoReply += new EventHandler<ParcelInfoReplyEventArgs>(Parcels_ParcelInfoReply);\r
             netcom.ClientLoggedOut += new EventHandler(netcom_ClientLoggedOut);\r
 \r
@@ -89,24 +89,24 @@ namespace Radegast
 \r
         void frmProfile_Disposed(object sender, EventArgs e)\r
         {\r
-            client.Avatars.OnAvatarProperties -= new AvatarManager.AvatarPropertiesCallback(Avatars_OnAvatarProperties);\r
-            client.Avatars.OnAvatarPicks -= new AvatarManager.AvatarPicksCallback(Avatars_OnAvatarPicks);\r
-            client.Avatars.OnPickInfo -= new AvatarManager.PickInfoCallback(Avatars_OnPickInfo);\r
+            client.Avatars.AvatarPropertiesReply -= new EventHandler<AvatarPropertiesReplyEventArgs>(Avatars_AvatarPropertiesReply);\r
+            client.Avatars.AvatarPicksReply -= new EventHandler<AvatarPicksReplyEventArgs>(Avatars_AvatarPicksReply);\r
+            client.Avatars.PickInfoReply -= new EventHandler<PickInfoReplyEventArgs>(Avatars_PickInfoReply);\r
             client.Parcels.ParcelInfoReply -= new EventHandler<ParcelInfoReplyEventArgs>(Parcels_ParcelInfoReply);\r
             netcom.ClientLoggedOut -= new EventHandler(netcom_ClientLoggedOut);\r
         }\r
 \r
-        void Avatars_OnAvatarPicks(UUID id, Dictionary<UUID, string> picks)\r
+        void Avatars_AvatarPicksReply(object sender, AvatarPicksReplyEventArgs e)\r
         {\r
-            if (id != agentID) return;\r
+            if (e.AvatarID != agentID) return;\r
 \r
             if (InvokeRequired)\r
             {\r
-                BeginInvoke(new MethodInvoker(() => Avatars_OnAvatarPicks(id, picks)));\r
+                BeginInvoke(new MethodInvoker(() => Avatars_AvatarPicksReply(sender, e)));\r
                 return;\r
             }\r
             gotPicks = true;\r
-            DisplayListOfPicks(picks);\r
+            DisplayListOfPicks(e.Picks);\r
 \r
         }\r
 \r
@@ -151,7 +151,7 @@ namespace Radegast
 \r
             if (pickCache.ContainsKey(requestedPick))\r
             {\r
-                Avatars_OnPickInfo(requestedPick, pickCache[requestedPick]);\r
+                Avatars_PickInfoReply(this, new PickInfoReplyEventArgs(requestedPick, pickCache[requestedPick]));\r
             }\r
             else\r
             {\r
@@ -159,53 +159,53 @@ namespace Radegast
             }\r
         }\r
 \r
-        void Avatars_OnPickInfo(UUID pickid, ProfilePick pick)\r
+        void Avatars_PickInfoReply(object sender, PickInfoReplyEventArgs e)\r
         {\r
-            if (pickid != requestedPick) return;\r
+            if (e.PickID != requestedPick) return;\r
 \r
             if (InvokeRequired)\r
             {\r
-                BeginInvoke(new MethodInvoker(() => Avatars_OnPickInfo(pickid, pick)));\r
+                BeginInvoke(new MethodInvoker(() => Avatars_PickInfoReply(sender, e)));\r
                 return;\r
             }\r
 \r
             lock (pickCache)\r
             {\r
-                if (!pickCache.ContainsKey(pickid))\r
-                    pickCache.Add(pickid, pick);\r
+                if (!pickCache.ContainsKey(e.PickID))\r
+                    pickCache.Add(e.PickID, e.Pick);\r
             }\r
 \r
-            currentPick = pick;\r
+            currentPick = e.Pick;\r
 \r
             if (pickPicturePanel.Controls.Count > 0)\r
                 pickPicturePanel.Controls[0].Dispose();\r
             pickPicturePanel.Controls.Clear();\r
 \r
-            if (pick.SnapshotID != UUID.Zero)\r
+            if (e.Pick.SnapshotID != UUID.Zero)\r
             {\r
-                SLImageHandler img = new SLImageHandler(instance, pick.SnapshotID, string.Empty);\r
+                SLImageHandler img = new SLImageHandler(instance, e.Pick.SnapshotID, string.Empty);\r
                 img.Dock = DockStyle.Fill;\r
                 img.SizeMode = PictureBoxSizeMode.StretchImage;\r
                 pickPicturePanel.Controls.Add(img);\r
             }\r
 \r
-            pickTitle.Text = pick.Name;\r
+            pickTitle.Text = e.Pick.Name;\r
 \r
-            pickDetail.Text = pick.Desc;\r
+            pickDetail.Text = e.Pick.Desc;\r
 \r
-            if (!parcelCache.ContainsKey(pick.ParcelID))\r
+            if (!parcelCache.ContainsKey(e.Pick.ParcelID))\r
             {\r
                 pickLocation.Text = string.Format("Unkown parcel, {0} ({1}, {2}, {3})",\r
-                    pick.SimName,\r
-                    ((int)pick.PosGlobal.X) % 256,\r
-                    ((int)pick.PosGlobal.Y) % 256,\r
-                    ((int)pick.PosGlobal.Z) % 256\r
+                    e.Pick.SimName,\r
+                    ((int)e.Pick.PosGlobal.X) % 256,\r
+                    ((int)e.Pick.PosGlobal.Y) % 256,\r
+                    ((int)e.Pick.PosGlobal.Z) % 256\r
                 );\r
-                client.Parcels.RequestParcelInfo(pick.ParcelID);\r
+                client.Parcels.RequestParcelInfo(e.Pick.ParcelID);\r
             }\r
             else\r
             {\r
-                Parcels_ParcelInfoReply(this, new ParcelInfoReplyEventArgs(parcelCache[pick.ParcelID]));\r
+                Parcels_ParcelInfoReply(this, new ParcelInfoReplyEventArgs(parcelCache[e.Pick.ParcelID]));\r
             }\r
         }\r
 \r
@@ -239,22 +239,18 @@ namespace Radegast
             Close();\r
         }\r
 \r
-        //comes in on separate thread\r
-        private void Avatars_OnAvatarProperties(UUID avatarID, Avatar.AvatarProperties properties)\r
+        void Avatars_AvatarPropertiesReply(object sender, AvatarPropertiesReplyEventArgs e)\r
         {\r
-            if (avatarID != agentID) return;\r
+            if (e.AvatarID != agentID) return;\r
 \r
             if (InvokeRequired)\r
             {\r
-                Invoke(new MethodInvoker(delegate()\r
-                {\r
-                    Avatars_OnAvatarProperties(avatarID, properties);\r
-                }));\r
+                Invoke(new MethodInvoker(() => Avatars_AvatarPropertiesReply(sender, e)));\r
                 return;\r
             }\r
 \r
-            FLImageID = properties.FirstLifeImage;\r
-            SLImageID = properties.ProfileImage;\r
+            FLImageID = e.Properties.FirstLifeImage;\r
+            SLImageID = e.Properties.ProfileImage;\r
 \r
             if (SLImageID != UUID.Zero)\r
             {\r
@@ -283,7 +279,7 @@ namespace Radegast
 \r
             this.BeginInvoke(\r
                 new OnSetProfileProperties(SetProfileProperties),\r
-                new object[] { properties });\r
+                new object[] { e.Properties});\r
         }\r
 \r
         //called on GUI thread\r

diff --git a/Radegast/GUI/Notifications/InventoryOfferNotification.cs b/Radegast/GUI/Notifications/InventoryOfferNotification.cs
index 7374ddc..e7e938f 100644 (file)
--- a/Radegast/GUI/Notifications/InventoryOfferNotification.cs
+++ b/Radegast/GUI/Notifications/InventoryOfferNotification.cs
@@ -60,7 +60,7 @@ namespace Radegast
             this.instance = instance;\r
             this.msg = msg;\r
 \r
-            client.Avatars.OnAvatarNames += new AvatarManager.AvatarNamesCallback(Avatars_OnAvatarNames);\r
+            client.Avatars.UUIDNameReply += new EventHandler<UUIDNameReplyEventArgs>(Avatars_UUIDNameReply);\r
 \r
             if (msg.BinaryBucket.Length > 0)\r
             {\r
@@ -97,14 +97,14 @@ namespace Radegast
 \r
         void ntfInventoryOffer_Disposed(object sender, EventArgs e)\r
         {\r
-            client.Avatars.OnAvatarNames -= new AvatarManager.AvatarNamesCallback(Avatars_OnAvatarNames);\r
+            client.Avatars.UUIDNameReply -= new EventHandler<UUIDNameReplyEventArgs>(Avatars_UUIDNameReply);\r
         }\r
 \r
-        void Avatars_OnAvatarNames(Dictionary<UUID, string> names)\r
+        void Avatars_UUIDNameReply(object sender, UUIDNameReplyEventArgs e)\r
         {\r
-            if (names.Keys.Contains(msg.FromAgentID))\r
+            if (e.Names.Keys.Contains(msg.FromAgentID))\r
             {\r
-                client.Avatars.OnAvatarNames -= new AvatarManager.AvatarNamesCallback(Avatars_OnAvatarNames);\r
+                client.Avatars.UUIDNameReply -= new EventHandler<UUIDNameReplyEventArgs>(Avatars_UUIDNameReply);\r
                 BeginInvoke(new MethodInvoker(() => txtInfo.Text = objectOfferText()));\r
             }\r
         }\r

diff --git a/plugins/Radegast.Plugin.Alice/Alice.cs b/plugins/Radegast.Plugin.Alice/Alice.cs
index db61dfb..c1f50fb 100644 (file)
--- a/plugins/Radegast.Plugin.Alice/Alice.cs
+++ b/plugins/Radegast.Plugin.Alice/Alice.cs
@@ -89,11 +89,12 @@ namespace Radegast.Plugin.Alice
             // Events\r
             Client.Self.ChatFromSimulator += new EventHandler<ChatEventArgs>(Self_ChatFromSimulator);\r
             Client.Self.IM += new EventHandler<InstantMessageEventArgs>(Self_IM);\r
-            Client.Avatars.OnAvatarProperties += new AvatarManager.AvatarPropertiesCallback(Avatars_OnAvatarProperties);\r
+            Client.Avatars.AvatarPropertiesReply += new EventHandler<AvatarPropertiesReplyEventArgs>(Avatars_AvatarPropertiesReply);\r
             Client.Network.OnConnected += new NetworkManager.ConnectedCallback(Network_OnConnected);\r
 \r
         }\r
 \r
+\r
         public void StopPlugin(RadegastInstance Instance)\r
         {\r
             // Remove the menu button\r
@@ -102,7 +103,7 @@ namespace Radegast.Plugin.Alice
             // Unregister events\r
             Client.Self.ChatFromSimulator -= new EventHandler<ChatEventArgs>(Self_ChatFromSimulator);\r
             Client.Self.IM -= new EventHandler<InstantMessageEventArgs>(Self_IM);\r
-            Client.Avatars.OnAvatarProperties -= new AvatarManager.AvatarPropertiesCallback(Avatars_OnAvatarProperties);\r
+            Client.Avatars.AvatarPropertiesReply -= new EventHandler<AvatarPropertiesReplyEventArgs>(Avatars_AvatarPropertiesReply);\r
             Client.Network.OnConnected -= new NetworkManager.ConnectedCallback(Network_OnConnected);\r
         }\r
 \r
@@ -111,11 +112,11 @@ namespace Radegast.Plugin.Alice
             Alice.GlobalSettings.updateSetting("name", FirstName(Client.Self.Name));\r
         }\r
 \r
-        void Avatars_OnAvatarProperties(UUID avatarID, Avatar.AvatarProperties properties)\r
+        void Avatars_AvatarPropertiesReply(object sender, AvatarPropertiesReplyEventArgs e)\r
         {\r
-            if (avatarID == Client.Self.AgentID)\r
+            if (e.AvatarID == Client.Self.AgentID)\r
             {\r
-                MyProfile = properties;\r
+                MyProfile = e.Properties;\r
                 Alice.GlobalSettings.updateSetting("birthday", MyProfile.BornOn);\r
                 DateTime bd;\r
                 if (DateTime.TryParse(MyProfile.BornOn, Utils.EnUsCulture, System.Globalization.DateTimeStyles.None, out bd))\r