diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index 43a9d86..df8b190 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |||
@@ -60,40 +60,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
60 | /// <summary> | 60 | /// <summary> |
61 | /// | 61 | /// |
62 | /// </summary> | 62 | /// </summary> |
63 | /// <remarks>Inefficient. TODO: Fixme</remarks> | ||
64 | /// <param name="fromAgentID"></param> | ||
65 | /// <param name="toAgentID"></param> | ||
66 | /// <param name="timestamp"></param> | ||
67 | /// <param name="fromAgentName"></param> | ||
68 | /// <param name="message"></param> | ||
69 | public void InstantMessage(LLUUID fromAgentID, LLUUID fromAgentSession, LLUUID toAgentID, LLUUID imSessionID, | ||
70 | uint timestamp, string fromAgentName, string message, byte dialog) | ||
71 | { | ||
72 | if (m_scenePresences.ContainsKey(toAgentID)) | ||
73 | { | ||
74 | if (m_scenePresences.ContainsKey(fromAgentID)) | ||
75 | { | ||
76 | // Local sim message | ||
77 | ScenePresence fromAvatar = m_scenePresences[fromAgentID]; | ||
78 | ScenePresence toAvatar = m_scenePresences[toAgentID]; | ||
79 | string fromName = fromAvatar.Firstname + " " + fromAvatar.Lastname; | ||
80 | toAvatar.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message, toAgentID, | ||
81 | imSessionID, fromName, dialog, timestamp); | ||
82 | } | ||
83 | else | ||
84 | { | ||
85 | // Message came from a user outside the sim, ignore? | ||
86 | } | ||
87 | } | ||
88 | else | ||
89 | { | ||
90 | // Grid message | ||
91 | } | ||
92 | } | ||
93 | |||
94 | /// <summary> | ||
95 | /// | ||
96 | /// </summary> | ||
97 | /// <param name="message"></param> | 63 | /// <param name="message"></param> |
98 | /// <param name="type"></param> | 64 | /// <param name="type"></param> |
99 | /// <param name="fromPos"></param> | 65 | /// <param name="fromPos"></param> |
@@ -531,4 +497,4 @@ namespace OpenSim.Region.Environment.Scenes | |||
531 | } | 497 | } |
532 | } | 498 | } |
533 | } | 499 | } |
534 | } \ No newline at end of file | 500 | } |