diff options
author | Adam Frisby | 2007-07-16 22:09:00 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-16 22:09:00 +0000 |
commit | 6c9d9b660d90f7e1c40498003f1eb7fb523f9b1d (patch) | |
tree | 4247676bc55248ea5a8d39544b14965f2d701112 | |
parent | * And yet more restructuring of startup sequence... (diff) | |
download | opensim-SC-6c9d9b660d90f7e1c40498003f1eb7fb523f9b1d.zip opensim-SC-6c9d9b660d90f7e1c40498003f1eb7fb523f9b1d.tar.gz opensim-SC-6c9d9b660d90f7e1c40498003f1eb7fb523f9b1d.tar.bz2 opensim-SC-6c9d9b660d90f7e1c40498003f1eb7fb523f9b1d.tar.xz |
* Trimmed a few hundred warnings off SimpleApp.
-rw-r--r-- | OpenSim/Framework/General/NpcClientBase.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Framework/General/NpcClientBase.cs b/OpenSim/Framework/General/NpcClientBase.cs index c31b628..11160e4 100644 --- a/OpenSim/Framework/General/NpcClientBase.cs +++ b/OpenSim/Framework/General/NpcClientBase.cs | |||
@@ -11,6 +11,7 @@ namespace OpenSim.Framework | |||
11 | { | 11 | { |
12 | public class NpcClientBase : IClientAPI | 12 | public class NpcClientBase : IClientAPI |
13 | { | 13 | { |
14 | #pragma warning disable 67 | ||
14 | public event ImprovedInstantMessage OnInstantMessage; | 15 | public event ImprovedInstantMessage OnInstantMessage; |
15 | public event ChatFromViewer OnChatFromViewer; | 16 | public event ChatFromViewer OnChatFromViewer; |
16 | public event RezObject OnRezObject; | 17 | public event RezObject OnRezObject; |
@@ -62,6 +63,7 @@ namespace OpenSim.Framework | |||
62 | 63 | ||
63 | 64 | ||
64 | public event EstateOwnerMessageRequest OnEstateOwnerMessage; | 65 | public event EstateOwnerMessageRequest OnEstateOwnerMessage; |
66 | #pragma warning restore 67 | ||
65 | 67 | ||
66 | public virtual LLVector3 StartPos | 68 | public virtual LLVector3 StartPos |
67 | { | 69 | { |
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs index 28c9b9a..af70f07 100644 --- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs | |||
@@ -22,6 +22,8 @@ namespace SimpleApp | |||
22 | private LLQuaternion bodyDirection = LLQuaternion.Identity; | 22 | private LLQuaternion bodyDirection = LLQuaternion.Identity; |
23 | private short count = 0; | 23 | private short count = 0; |
24 | 24 | ||
25 | #pragma warning disable 67 | ||
26 | |||
25 | public event ImprovedInstantMessage OnInstantMessage; | 27 | public event ImprovedInstantMessage OnInstantMessage; |
26 | public event ChatFromViewer OnChatFromViewer; | 28 | public event ChatFromViewer OnChatFromViewer; |
27 | public event RezObject OnRezObject; | 29 | public event RezObject OnRezObject; |
@@ -73,6 +75,8 @@ namespace SimpleApp | |||
73 | public event ObjectDeselect OnObjectDeselect; | 75 | public event ObjectDeselect OnObjectDeselect; |
74 | public event EstateOwnerMessageRequest OnEstateOwnerMessage; | 76 | public event EstateOwnerMessageRequest OnEstateOwnerMessage; |
75 | 77 | ||
78 | #pragma warning restore 67 | ||
79 | |||
76 | private LLUUID myID = LLUUID.Random(); | 80 | private LLUUID myID = LLUUID.Random(); |
77 | public MyNpcCharacter() | 81 | public MyNpcCharacter() |
78 | { | 82 | { |