diff options
author | UbitUmarov | 2017-11-12 02:51:59 +0000 |
---|---|---|
committer | UbitUmarov | 2017-11-12 02:51:59 +0000 |
commit | e0fd9661864da635504e0488dfff0631b595bd6d (patch) | |
tree | 4cabb36538478575b0001d6f9c3780a5729e4f06 /OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs | |
parent | mantis 8260 fix script count on delete and remove redundantTriggerRemoveScrip... (diff) | |
download | opensim-SC_OLD-e0fd9661864da635504e0488dfff0631b595bd6d.zip opensim-SC_OLD-e0fd9661864da635504e0488dfff0631b595bd6d.tar.gz opensim-SC_OLD-e0fd9661864da635504e0488dfff0631b595bd6d.tar.bz2 opensim-SC_OLD-e0fd9661864da635504e0488dfff0631b595bd6d.tar.xz |
off line module V2 must not sent a empty mutes list. That is mutes modules job (or let viewers use they cached entries if none)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs b/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs index 5340bcd..d8164e7 100644 --- a/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs +++ b/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs | |||
@@ -114,7 +114,6 @@ namespace OpenSim.OfflineIM | |||
114 | scene.ForEachClient(delegate(IClientAPI client) | 114 | scene.ForEachClient(delegate(IClientAPI client) |
115 | { | 115 | { |
116 | client.OnRetrieveInstantMessages -= RetrieveInstantMessages; | 116 | client.OnRetrieveInstantMessages -= RetrieveInstantMessages; |
117 | client.OnMuteListRequest -= OnMuteListRequest; | ||
118 | }); | 117 | }); |
119 | } | 118 | } |
120 | 119 | ||
@@ -162,7 +161,6 @@ namespace OpenSim.OfflineIM | |||
162 | private void OnNewClient(IClientAPI client) | 161 | private void OnNewClient(IClientAPI client) |
163 | { | 162 | { |
164 | client.OnRetrieveInstantMessages += RetrieveInstantMessages; | 163 | client.OnRetrieveInstantMessages += RetrieveInstantMessages; |
165 | client.OnMuteListRequest += OnMuteListRequest; | ||
166 | } | 164 | } |
167 | 165 | ||
168 | private void RetrieveInstantMessages(IClientAPI client) | 166 | private void RetrieveInstantMessages(IClientAPI client) |
@@ -194,20 +192,6 @@ namespace OpenSim.OfflineIM | |||
194 | } | 192 | } |
195 | } | 193 | } |
196 | 194 | ||
197 | // Apparently this is needed in order for the viewer to request the IMs. | ||
198 | private void OnMuteListRequest(IClientAPI client, uint crc) | ||
199 | { | ||
200 | m_log.DebugFormat("[OfflineIM.V2] Got mute list request for crc {0}", crc); | ||
201 | string filename = "mutes" + client.AgentId.ToString(); | ||
202 | |||
203 | IXfer xfer = client.Scene.RequestModuleInterface<IXfer>(); | ||
204 | if (xfer != null) | ||
205 | { | ||
206 | xfer.AddNewFile(filename, new Byte[0]); | ||
207 | client.SendMuteListUpdate(filename); | ||
208 | } | ||
209 | } | ||
210 | |||
211 | private void UndeliveredMessage(GridInstantMessage im) | 195 | private void UndeliveredMessage(GridInstantMessage im) |
212 | { | 196 | { |
213 | if (im.dialog != (byte)InstantMessageDialog.MessageFromObject && | 197 | if (im.dialog != (byte)InstantMessageDialog.MessageFromObject && |