diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
| commit | 311b51a1843f43daa7796a46961b65fe702e1b85 (patch) | |
| tree | 756554b330c8bdd970f319c3af0327efb9017673 /OpenSim/Region/OptionalModules/Agent | |
| parent | * Some Physics Scene Changes to prepare for larger regions (diff) | |
| parent | Fixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020) (diff) | |
| download | opensim-SC-311b51a1843f43daa7796a46961b65fe702e1b85.zip opensim-SC-311b51a1843f43daa7796a46961b65fe702e1b85.tar.gz opensim-SC-311b51a1843f43daa7796a46961b65fe702e1b85.tar.bz2 opensim-SC-311b51a1843f43daa7796a46961b65fe702e1b85.tar.xz | |
*remove conflicts
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 4 |
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 | { |