diff options
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs index 7f9e5af..257c221 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | |||
@@ -47,6 +47,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
47 | private bool enabled = true; | 47 | private bool enabled = true; |
48 | private List<Scene> m_SceneList = new List<Scene>(); | 48 | private List<Scene> m_SceneList = new List<Scene>(); |
49 | private string m_RestURL = String.Empty; | 49 | private string m_RestURL = String.Empty; |
50 | private bool m_ForwardOfflineGroupMessages = true; | ||
50 | 51 | ||
51 | public void Initialise(Scene scene, IConfigSource config) | 52 | public void Initialise(Scene scene, IConfigSource config) |
52 | { | 53 | { |
@@ -67,6 +68,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
67 | return; | 68 | return; |
68 | } | 69 | } |
69 | 70 | ||
71 | if (cnf != null) | ||
72 | m_ForwardOfflineGroupMessages = cnf.GetBoolean("ForwardOfflineGroupMessages", m_ForwardOfflineGroupMessages); | ||
73 | |||
70 | lock (m_SceneList) | 74 | lock (m_SceneList) |
71 | { | 75 | { |
72 | if (m_SceneList.Count == 0) | 76 | if (m_SceneList.Count == 0) |
@@ -185,7 +189,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
185 | 189 | ||
186 | private void UndeliveredMessage(GridInstantMessage im) | 190 | private void UndeliveredMessage(GridInstantMessage im) |
187 | { | 191 | { |
188 | if (im.offline != 0) | 192 | if ((im.offline != 0) |
193 | && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages))) | ||
189 | { | 194 | { |
190 | bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>( | 195 | bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>( |
191 | "POST", m_RestURL+"/SaveMessage/", im); | 196 | "POST", m_RestURL+"/SaveMessage/", im); |