diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs index cd8c82c..b106435 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs | |||
@@ -110,33 +110,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
110 | 110 | ||
111 | #endregion | 111 | #endregion |
112 | 112 | ||
113 | private void OnInstantMessage(IClientAPI client, UUID fromAgentID, | 113 | public void OnInstantMessage(IClientAPI client, GridInstantMessage im) |
114 | UUID fromAgentSession, UUID toAgentID, | ||
115 | UUID imSessionID, uint timestamp, string fromAgentName, | ||
116 | string message, byte dialog, bool fromGroup, byte offline, | ||
117 | uint ParentEstateID, Vector3 Position, UUID RegionID, | ||
118 | byte[] binaryBucket) | ||
119 | { | ||
120 | // This module handles exclusively private text IM from user | ||
121 | // to user. All others will be caught in other modules | ||
122 | // | ||
123 | if ( dialog != (byte)InstantMessageDialog.MessageFromAgent | ||
124 | && dialog != (byte)InstantMessageDialog.StartTyping | ||
125 | && dialog != (byte)InstantMessageDialog.StopTyping) | ||
126 | { | ||
127 | return; | ||
128 | } | ||
129 | |||
130 | GridInstantMessage im = new GridInstantMessage(client.Scene, | ||
131 | fromAgentID, fromAgentName, fromAgentSession, toAgentID, | ||
132 | dialog, fromGroup, message, imSessionID, | ||
133 | offline != 0 ? true : false, Position, | ||
134 | binaryBucket); | ||
135 | |||
136 | ProcessInstantMessage(client, im); | ||
137 | } | ||
138 | |||
139 | private void ProcessInstantMessage(IClientAPI client, GridInstantMessage im) | ||
140 | { | 114 | { |
141 | byte dialog = im.dialog; | 115 | byte dialog = im.dialog; |
142 | 116 | ||
@@ -183,7 +157,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
183 | // so we can depend on the above not trying to send | 157 | // so we can depend on the above not trying to send |
184 | // via grid again | 158 | // via grid again |
185 | // | 159 | // |
186 | ProcessInstantMessage(null, msg); | 160 | OnInstantMessage(null, msg); |
187 | } | 161 | } |
188 | } | 162 | } |
189 | } | 163 | } |