aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World')
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs32
1 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index 78aee92..33eade2 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -59,22 +59,22 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
59 59
60 public void Say(string message) 60 public void Say(string message)
61 { 61 {
62 SendOnChatFromViewer(message, ChatTypeEnum.Say); 62 SendOnChatFromClient(message, ChatTypeEnum.Say);
63 } 63 }
64 64
65 public void Shout(string message) 65 public void Shout(string message)
66 { 66 {
67 SendOnChatFromViewer(message, ChatTypeEnum.Shout); 67 SendOnChatFromClient(message, ChatTypeEnum.Shout);
68 } 68 }
69 69
70 public void Whisper(string message) 70 public void Whisper(string message)
71 { 71 {
72 SendOnChatFromViewer(message, ChatTypeEnum.Whisper); 72 SendOnChatFromClient(message, ChatTypeEnum.Whisper);
73 } 73 }
74 74
75 public void Broadcast(string message) 75 public void Broadcast(string message)
76 { 76 {
77 SendOnChatFromViewer(message, ChatTypeEnum.Broadcast); 77 SendOnChatFromClient(message, ChatTypeEnum.Broadcast);
78 } 78 }
79 79
80 public void GiveMoney(UUID target, int amount) 80 public void GiveMoney(UUID target, int amount)
@@ -132,19 +132,19 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
132 132
133 #region Internal Functions 133 #region Internal Functions
134 134
135 private void SendOnChatFromViewer(string message, ChatTypeEnum chatType) 135 private void SendOnChatFromClient(string message, ChatTypeEnum chatType)
136 { 136 {
137 OSChatMessage chatFromViewer = new OSChatMessage(); 137 OSChatMessage chatFromClient = new OSChatMessage();
138 chatFromViewer.Channel = 0; 138 chatFromClient.Channel = 0;
139 chatFromViewer.From = Name; 139 chatFromClient.From = Name;
140 chatFromViewer.Message = message; 140 chatFromClient.Message = message;
141 chatFromViewer.Position = StartPos; 141 chatFromClient.Position = StartPos;
142 chatFromViewer.Scene = m_scene; 142 chatFromClient.Scene = m_scene;
143 chatFromViewer.Sender = this; 143 chatFromClient.Sender = this;
144 chatFromViewer.SenderUUID = AgentId; 144 chatFromClient.SenderUUID = AgentId;
145 chatFromViewer.Type = chatType; 145 chatFromClient.Type = chatType;
146 146
147 OnChatFromViewer(this, chatFromViewer); 147 OnChatFromClient(this, chatFromClient);
148 } 148 }
149 149
150 #endregion 150 #endregion
@@ -161,7 +161,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
161 public event Action<IClientAPI> OnConnectionClosed; 161 public event Action<IClientAPI> OnConnectionClosed;
162 public event GenericMessage OnGenericMessage; 162 public event GenericMessage OnGenericMessage;
163 public event ImprovedInstantMessage OnInstantMessage; 163 public event ImprovedInstantMessage OnInstantMessage;
164 public event ChatMessage OnChatFromViewer; 164 public event ChatMessage OnChatFromClient;
165 public event TextureRequest OnRequestTexture; 165 public event TextureRequest OnRequestTexture;
166 public event RezObject OnRezObject; 166 public event RezObject OnRezObject;
167 public event ModifyTerrain OnModifyTerrain; 167 public event ModifyTerrain OnModifyTerrain;