From 10c1de4c747cd5534eb72a59233f9cba56583ae8 Mon Sep 17 00:00:00 2001 From: Jim Radford Date: Tue, 3 Nov 2009 07:58:22 +0000 Subject: [PATCH] Switched Initialization for PacketDecoder into static constructor to dummyproof the class git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3208 52acb1d6-8a22-11de-b505-999d5b087335 --- OpenMetaverse/PacketDecoder.cs | 2 +- Programs/GridProxy/Plugins/Analyst.cs | 3 +-- Programs/WinGridProxy/FormWinGridProxy.cs | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/OpenMetaverse/PacketDecoder.cs b/OpenMetaverse/PacketDecoder.cs index 418fb4e0..750189f2 100644 --- a/OpenMetaverse/PacketDecoder.cs +++ b/OpenMetaverse/PacketDecoder.cs @@ -19,7 +19,7 @@ namespace OpenMetaverse.Packets private static Dictionary> Callbacks = new Dictionary>(); - public static void InitializeDecoder() + static PacketDecoder() { AddCallback("Color", DecodeColorField); AddCallback("TextColor", DecodeColorField); diff --git a/Programs/GridProxy/Plugins/Analyst.cs b/Programs/GridProxy/Plugins/Analyst.cs index 9629461a..89c4c1b9 100644 --- a/Programs/GridProxy/Plugins/Analyst.cs +++ b/Programs/GridProxy/Plugins/Analyst.cs @@ -56,8 +56,7 @@ public class Analyst : ProxyPlugin //private PacketDecoder DecodePacket = new PacketDecoder(); public Analyst(ProxyFrame frame) - { - PacketDecoder.InitializeDecoder(); + { this.frame = frame; this.proxy = frame.proxy; } diff --git a/Programs/WinGridProxy/FormWinGridProxy.cs b/Programs/WinGridProxy/FormWinGridProxy.cs index cbf8f6d7..df82fff5 100644 --- a/Programs/WinGridProxy/FormWinGridProxy.cs +++ b/Programs/WinGridProxy/FormWinGridProxy.cs @@ -90,8 +90,6 @@ namespace WinGridProxy Logger.Log("WinGridProxy ready", Helpers.LogLevel.Info); - PacketDecoder.InitializeDecoder(); - if (FireEventAppender.Instance != null) { FireEventAppender.Instance.MessageLoggedEvent += new MessageLoggedEventHandler(Instance_MessageLoggedEvent);