aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Avatar/InstantMessage
diff options
context:
space:
mode:
authorAdam Frisby2008-11-08 17:20:54 +0000
committerAdam Frisby2008-11-08 17:20:54 +0000
commitcf0a14bec94322656f57890d49fead85ed31730e (patch)
tree861596444093bb68567cda8583cd0e94a618c120 /OpenSim/Region/Environment/Modules/Avatar/InstantMessage
parentFix broken build since r7179 (diff)
downloadopensim-SC_OLD-cf0a14bec94322656f57890d49fead85ed31730e.zip
opensim-SC_OLD-cf0a14bec94322656f57890d49fead85ed31730e.tar.gz
opensim-SC_OLD-cf0a14bec94322656f57890d49fead85ed31730e.tar.bz2
opensim-SC_OLD-cf0a14bec94322656f57890d49fead85ed31730e.tar.xz
* Added IClientIM to IClientCore interfaces
* Changed SendInstantMessage, dropped fromAgentSession and imSessionID as security precaution, see http://opensimulator.org/wiki/OpenSim_0.6_IClientAPI#Porting_Guide for details on porting. * Removed unused usings from Framework.*
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar/InstantMessage')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
index 5597381..b8fbe2b 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -155,8 +155,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
155 ScenePresence user = (ScenePresence) scene.Entities[toAgentID]; 155 ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
156 if (!user.IsChildAgent) 156 if (!user.IsChildAgent)
157 { 157 {
158 user.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message, 158 user.ControllingClient.SendInstantMessage(fromAgentID, message,
159 toAgentID, imSessionID, fromAgentName, dialog, 159 toAgentID, fromAgentName, dialog,
160 timestamp, fromGroup, binaryBucket); 160 timestamp, fromGroup, binaryBucket);
161 // Message sent 161 // Message sent
162 return; 162 return;
@@ -172,8 +172,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
172 // Local message 172 // Local message
173 ScenePresence user = (ScenePresence) scene.Entities[toAgentID]; 173 ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
174 174
175 user.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message, 175 user.ControllingClient.SendInstantMessage(fromAgentID, message,
176 toAgentID, imSessionID, fromAgentName, dialog, 176 toAgentID, fromAgentName, dialog,
177 timestamp, fromGroup, binaryBucket); 177 timestamp, fromGroup, binaryBucket);
178 // Message sent 178 // Message sent
179 return; 179 return;
@@ -199,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
199 if (client != null) 199 if (client != null)
200 { 200 {
201 if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop) 201 if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop)
202 client.SendInstantMessage(toAgentID, fromAgentSession, "Unable to send instant message. User is not logged in.", fromAgentID, imSessionID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message"); 202 client.SendInstantMessage(toAgentID, "Unable to send instant message. User is not logged in.", fromAgentID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message");
203 } 203 }
204 } 204 }
205 } 205 }
@@ -551,7 +551,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
551 if (client != null) 551 if (client != null)
552 { 552 {
553 if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop) 553 if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop)
554 client.SendInstantMessage(toAgentID, fromAgentSession, "Unable to send instant message", fromAgentID, imSessionID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message"); 554 client.SendInstantMessage(toAgentID, "Unable to send instant message", fromAgentID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());
555 } 555 }
556 return; 556 return;
557 } 557 }
@@ -562,7 +562,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
562 if (client != null) 562 if (client != null)
563 { 563 {
564 if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop) 564 if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop)
565 client.SendInstantMessage(toAgentID, fromAgentSession, "Unable to send instant message", fromAgentID, imSessionID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message"); 565 client.SendInstantMessage(toAgentID, "Unable to send instant message", fromAgentID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());
566 } 566 }
567 return; 567 return;
568 } 568 }
@@ -635,7 +635,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
635 if (client != null) 635 if (client != null)
636 { 636 {
637 if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop) 637 if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop)
638 client.SendInstantMessage(toAgentID, fromAgentSession, "Unable to send instant message: Agent Offline", fromAgentID, imSessionID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message"); 638 client.SendInstantMessage(toAgentID, "Unable to send instant message: Agent Offline", fromAgentID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message");
639 } 639 }
640 } 640 }
641 } 641 }
@@ -643,7 +643,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
643 { 643 {
644 // send Agent doesn't exist message 644 // send Agent doesn't exist message
645 if (client != null) 645 if (client != null)
646 client.SendInstantMessage(toAgentID, fromAgentSession, "Unable to send instant message: Are you sure this agent exists anymore?", fromAgentID, imSessionID, "System", (byte)InstantMessageDialog.MessageFromObject, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message"); 646 client.SendInstantMessage(toAgentID, "Unable to send instant message: Are you sure this agent exists anymore?", fromAgentID, "System", (byte)InstantMessageDialog.MessageFromObject, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message");
647 } 647 }
648 648
649 } 649 }