diff options
author | Diva Canto | 2010-01-15 17:24:41 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-15 17:24:41 -0800 |
commit | 32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f (patch) | |
tree | e20c1afa3edc76101eea15765a447b13b3c4946e /OpenSim/Region/CoreModules/Avatar | |
parent | Comment (diff) | |
parent | Merge branch 'master' into presence-refactor (diff) | |
download | opensim-SC_OLD-32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f.zip opensim-SC_OLD-32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f.tar.gz opensim-SC_OLD-32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f.tar.bz2 opensim-SC_OLD-32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f.tar.xz |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs index a835c52..e48b078 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | |||
@@ -48,6 +48,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
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 | IMessageTransferModule m_TransferModule = null; | 50 | IMessageTransferModule m_TransferModule = null; |
51 | private bool m_ForwardOfflineGroupMessages = true; | ||
51 | 52 | ||
52 | public void Initialise(IConfigSource config) | 53 | public void Initialise(IConfigSource config) |
53 | { | 54 | { |
@@ -71,6 +72,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
71 | enabled = false; | 72 | enabled = false; |
72 | return; | 73 | return; |
73 | } | 74 | } |
75 | |||
76 | m_ForwardOfflineGroupMessages = cnf.GetBoolean("ForwardOfflineGroupMessages", m_ForwardOfflineGroupMessages); | ||
74 | } | 77 | } |
75 | 78 | ||
76 | public void AddRegion(Scene scene) | 79 | public void AddRegion(Scene scene) |
@@ -192,7 +195,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
192 | 195 | ||
193 | private void UndeliveredMessage(GridInstantMessage im) | 196 | private void UndeliveredMessage(GridInstantMessage im) |
194 | { | 197 | { |
195 | if (im.offline != 0) | 198 | if ((im.offline != 0) |
199 | && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages))) | ||
196 | { | 200 | { |
197 | bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>( | 201 | bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>( |
198 | "POST", m_RestURL+"/SaveMessage/", im); | 202 | "POST", m_RestURL+"/SaveMessage/", im); |