Merge branch 'master' into presence-refactor

author: Melanie 2010-01-04 21:41:33 +0000
committer: Melanie 2010-01-04 21:41:33 +0000
commit: 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch)
tree: badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server
parent: Forgot to add these to the grid configs, so that logins work. (diff)
parent: Finish conversion if XInventoryService (diff)
download: opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip
opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz
opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2
opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz
1 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 6c2b94a..5d97a12 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -837,24 +837,24 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
        public event AvatarInterestUpdate OnAvatarInterestUpdate;
        public event PlacesQuery OnPlacesQuery;
        public event FindAgentUpdate OnFindAgentEvent;
-                public event TrackAgentUpdate OnTrackAgentEvent;
+        public event TrackAgentUpdate OnTrackAgentEvent;
-                public event NewUserReport OnUserReportEvent;
+        public event NewUserReport OnUserReportEvent;
-                public event SaveStateHandler OnSaveStateEvent;
+        public event SaveStateHandler OnSaveStateEvent;
-                public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
+        public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
-                public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
+        public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
-                public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;         
+        public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
-                public event FreezeUserUpdate OnParcelFreezeUserEvent;
+        public event FreezeUserUpdate OnParcelFreezeUserEvent;
-                public event EjectUserUpdate OnParcelEjectUserEvent;
+        public event EjectUserUpdate OnParcelEjectUserEvent;
-                public event ParcelBuyPass OnParcelBuyPass;
+        public event ParcelBuyPass OnParcelBuyPass;
-                public event ParcelGodMark OnParcelGodMark;
+        public event ParcelGodMark OnParcelGodMark;
-                public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
+        public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
-                public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
+        public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
-                public event SimWideDeletesDelegate OnSimWideDeletes;
+        public event SimWideDeletesDelegate OnSimWideDeletes;
-                public event SendPostcard OnSendPostcard;
+        public event SendPostcard OnSendPostcard;
-                public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
+        public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
-                public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
+        public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
-                public event GodlikeMessage onGodlikeMessageEvent;
+        public event GodlikeMessage onGodlikeMessageEvent;
-                public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
+        public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
 #pragma warning restore 67
author	Melanie	2010-01-04 21:41:33 +0000
committer	Melanie	2010-01-04 21:41:33 +0000
commit	7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch)
tree	badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server
parent	Forgot to add these to the grid configs, so that logins work. (diff)
parent	Finish conversion if XInventoryService (diff)
download	opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 6c2b94a..5d97a12 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -837,24 +837,24 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
837	public event AvatarInterestUpdate OnAvatarInterestUpdate;	837	public event AvatarInterestUpdate OnAvatarInterestUpdate;
838	public event PlacesQuery OnPlacesQuery;	838	public event PlacesQuery OnPlacesQuery;
839	public event FindAgentUpdate OnFindAgentEvent;	839	public event FindAgentUpdate OnFindAgentEvent;
840	public event TrackAgentUpdate OnTrackAgentEvent;	840	public event TrackAgentUpdate OnTrackAgentEvent;
841	public event NewUserReport OnUserReportEvent;	841	public event NewUserReport OnUserReportEvent;
842	public event SaveStateHandler OnSaveStateEvent;	842	public event SaveStateHandler OnSaveStateEvent;
843	public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;	843	public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
844	public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;	844	public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
845	public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;	845	public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
846	public event FreezeUserUpdate OnParcelFreezeUserEvent;	846	public event FreezeUserUpdate OnParcelFreezeUserEvent;
847	public event EjectUserUpdate OnParcelEjectUserEvent;	847	public event EjectUserUpdate OnParcelEjectUserEvent;
848	public event ParcelBuyPass OnParcelBuyPass;	848	public event ParcelBuyPass OnParcelBuyPass;
849	public event ParcelGodMark OnParcelGodMark;	849	public event ParcelGodMark OnParcelGodMark;
850	public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;	850	public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
851	public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;	851	public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
852	public event SimWideDeletesDelegate OnSimWideDeletes;	852	public event SimWideDeletesDelegate OnSimWideDeletes;
853	public event SendPostcard OnSendPostcard;	853	public event SendPostcard OnSendPostcard;
854	public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;	854	public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
855	public event MuteListEntryRemove OnRemoveMuteListEntryEvent;	855	public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
856	public event GodlikeMessage onGodlikeMessageEvent;	856	public event GodlikeMessage onGodlikeMessageEvent;
857	public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;	857	public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
858		858
859	#pragma warning restore 67	859	#pragma warning restore 67
860		860