aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2009-05-30 09:37:11 +0000
committerAdam Frisby2009-05-30 09:37:11 +0000
commite70910c3e3a281ff42e886a55f0627aab1c2725f (patch)
treedf7bbaea567dd239126fad8db4dbd3d59878991b
parent* You are likely to be eaten by a grue. (diff)
downloadopensim-SC_OLD-e70910c3e3a281ff42e886a55f0627aab1c2725f.zip
opensim-SC_OLD-e70910c3e3a281ff42e886a55f0627aab1c2725f.tar.gz
opensim-SC_OLD-e70910c3e3a281ff42e886a55f0627aab1c2725f.tar.bz2
opensim-SC_OLD-e70910c3e3a281ff42e886a55f0627aab1c2725f.tar.xz
* Tweaks to /WHO listings.
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs32
1 files changed, 23 insertions, 9 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index bb20dfd..eb70b71 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -150,7 +150,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
150 case "KILL": 150 case "KILL":
151 case "LINKS": 151 case "LINKS":
152 case "LUSERS": 152 case "LUSERS":
153 case "MODE":
154 case "OPER": 153 case "OPER":
155 case "PART": 154 case "PART":
156 case "REHASH": 155 case "REHASH":
@@ -178,6 +177,10 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
178 IRC_SendReplyJoin(); 177 IRC_SendReplyJoin();
179 break; 178 break;
180 179
180 case "MODE":
181 IRC_SendReplyModeChannel();
182 break;
183
181 case "USER": 184 case "USER":
182 IRC_ProcessUser(message); 185 IRC_ProcessUser(message);
183 IRC_Ready(); 186 IRC_Ready();
@@ -214,6 +217,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
214 break; 217 break;
215 218
216 case "WHO": // TODO 219 case "WHO": // TODO
220 IRC_SendNamesReply();
217 IRC_SendWhoReply(); 221 IRC_SendWhoReply();
218 break; 222 break;
219 223
@@ -280,6 +284,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
280 IRC_SendNamesReply(); 284 IRC_SendNamesReply();
281 } 285 }
282 286
287 private void IRC_SendReplyModeChannel()
288 {
289 SendServerCommand("324 " + m_nick + " " + IrcRegionName + " +n");
290 //SendCommand(":" + IrcRegionName + " MODE +n");
291 }
292
283 private void IRC_ProcessUser(string message) 293 private void IRC_ProcessUser(string message)
284 { 294 {
285 string[] userArgs = ExtractParameters(message); 295 string[] userArgs = ExtractParameters(message);
@@ -323,7 +333,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
323 msg.Scene = m_scene; 333 msg.Scene = m_scene;
324 msg.SenderObject = null; 334 msg.SenderObject = null;
325 msg.SenderUUID = this.AgentId; 335 msg.SenderUUID = this.AgentId;
326 msg.Type = ChatTypeEnum.Broadcast; 336 msg.Type = ChatTypeEnum.Say;
327 337
328 OnChatFromClient(this, msg); 338 OnChatFromClient(this, msg);
329 } 339 }
@@ -340,7 +350,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
340 350
341 foreach (EntityBase user in users) 351 foreach (EntityBase user in users)
342 { 352 {
343 SendServerCommand("353 " + IrcRegionName + " :+" + user.Name.Replace(" ", "")); 353 SendServerCommand("353 " + m_nick + " = " + IrcRegionName + " :" + user.Name.Replace(" ", ""));
344 } 354 }
345 SendServerCommand("366 " + IrcRegionName + " :End of /NAMES list"); 355 SendServerCommand("366 " + IrcRegionName + " :End of /NAMES list");
346 } 356 }
@@ -351,11 +361,15 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
351 361
352 foreach (EntityBase user in users) 362 foreach (EntityBase user in users)
353 { 363 {
354 //:kubrick.freenode.net 352 toblerone3742 #freenode i=nalioth freenode/staff/ubuntu.member.nalioth irc.freenode.net nalioth G :0 http://www.ubuntu.com/donations 364 /*SendServerCommand(String.Format("352 {0} {1} {2} {3} {4} {5} :0 {6}", IrcRegionName,
355 //:opensimircd 352 #OpenSim-Test AdamFrisbyIRC nohost.com irc.opensimulator AdamFrisbyIRC H+ :1 Adam FrisbyIRC 365 user.Name.Replace(" ", ""), "nohost.com", "opensimircd",
356 SendServerCommand("352 " + user.Name.Replace(" ", "") + " " + IrcRegionName + " nohost.com irc.opensimulator " + user.Name.Replace(" ", "") + " H+ " + ":1 " + user.Name); 366 user.Name.Replace(" ", ""), 'H', user.Name));*/
367
368 SendServerCommand("352 " + m_nick + " " + IrcRegionName + " n=" + user.Name.Replace(" ", "") + " fakehost.com " + user.Name.Replace(" ", "") + " H " + ":0 " + user.Name);
369
370 //SendServerCommand("352 " + IrcRegionName + " " + user.Name.Replace(" ", "") + " nohost.com irc.opensimulator " + user.Name.Replace(" ", "") + " H " + ":0 " + user.Name);
357 } 371 }
358 SendServerCommand("315 " + IrcRegionName + " :End of /WHO list"); 372 SendServerCommand("315 " + m_nick + " " + IrcRegionName + " :End of /WHO list");
359 } 373 }
360 374
361 private void IRC_SendMOTD() 375 private void IRC_SendMOTD()
@@ -472,7 +486,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
472 486
473 public Vector3 StartPos 487 public Vector3 StartPos
474 { 488 {
475 get { return Vector3.Zero; } 489 get { return new Vector3(128, 128, 50); }
476 set { } 490 set { }
477 } 491 }
478 492
@@ -872,7 +886,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
872 886
873 public void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible) 887 public void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible)
874 { 888 {
875 if (audible > 0) 889 if (audible > 0 && message.Length > 0)
876 IRC_SendChannelPrivmsg(fromName, message); 890 IRC_SendChannelPrivmsg(fromName, message);
877 } 891 }
878 892