aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
diff options
context:
space:
mode:
authorDiva Canto2009-08-16 08:59:58 -0700
committerDiva Canto2009-08-16 08:59:58 -0700
commit6808b9109e33a111e3655ae214cd7b80ef3346f4 (patch)
tree02cddcbd4d6676dfc4840863e498943986b19c47 /OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
parentMerge branch 'master' into inventory-connector (diff)
parent* Implements ISecurityCredential member on SPAvatar, SPAvatarAttachment (diff)
downloadopensim-SC_OLD-6808b9109e33a111e3655ae214cd7b80ef3346f4.zip
opensim-SC_OLD-6808b9109e33a111e3655ae214cd7b80ef3346f4.tar.gz
opensim-SC_OLD-6808b9109e33a111e3655ae214cd7b80ef3346f4.tar.bz2
opensim-SC_OLD-6808b9109e33a111e3655ae214cd7b80ef3346f4.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into inventory-connector
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 08fc61f..4a2d7b5 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -634,7 +634,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
634 { 634 {
635 get { return (uint)Util.RandomClass.Next(0,int.MaxValue); } 635 get { return (uint)Util.RandomClass.Next(0,int.MaxValue); }
636 } 636 }
637 637#pragma warning disable 67
638 public event GenericMessage OnGenericMessage; 638 public event GenericMessage OnGenericMessage;
639 public event ImprovedInstantMessage OnInstantMessage; 639 public event ImprovedInstantMessage OnInstantMessage;
640 public event ChatMessage OnChatFromClient; 640 public event ChatMessage OnChatFromClient;
@@ -686,6 +686,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
686 public event SpinStop OnSpinStop; 686 public event SpinStop OnSpinStop;
687 public event UpdateShape OnUpdatePrimShape; 687 public event UpdateShape OnUpdatePrimShape;
688 public event ObjectExtraParams OnUpdateExtraParams; 688 public event ObjectExtraParams OnUpdateExtraParams;
689 public event ObjectRequest OnObjectRequest;
689 public event ObjectSelect OnObjectSelect; 690 public event ObjectSelect OnObjectSelect;
690 public event ObjectDeselect OnObjectDeselect; 691 public event ObjectDeselect OnObjectDeselect;
691 public event GenericCall7 OnObjectDescription; 692 public event GenericCall7 OnObjectDescription;
@@ -825,6 +826,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
825 public event AvatarNotesUpdate OnAvatarNotesUpdate; 826 public event AvatarNotesUpdate OnAvatarNotesUpdate;
826 public event MuteListRequest OnMuteListRequest; 827 public event MuteListRequest OnMuteListRequest;
827 public event PlacesQuery OnPlacesQuery; 828 public event PlacesQuery OnPlacesQuery;
829#pragma warning restore 67
828 830
829 public void SetDebugPacketLevel(int newDebug) 831 public void SetDebugPacketLevel(int newDebug)
830 { 832 {