aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-01-08 05:31:31 +0000
committerMelanie2010-01-08 05:31:31 +0000
commitbba557aff667aae3118e9ff2e4f841ecd31a50be (patch)
tree47211acc793cb5b05af47b924035cb58fc2c29bf
parentMoving the new group data structures out of LLClientView into GroupData. (diff)
parentAdds config option "ForwardOfflineGroupMessages" to allow disabling of group ... (diff)
downloadopensim-SC_OLD-bba557aff667aae3118e9ff2e4f841ecd31a50be.zip
opensim-SC_OLD-bba557aff667aae3118e9ff2e4f841ecd31a50be.tar.gz
opensim-SC_OLD-bba557aff667aae3118e9ff2e4f841ecd31a50be.tar.bz2
opensim-SC_OLD-bba557aff667aae3118e9ff2e4f841ecd31a50be.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs7
-rw-r--r--bin/OpenSim.ini.example1
2 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index 1614b70..450897c 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)
@@ -182,7 +186,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
182 186
183 private void UndeliveredMessage(GridInstantMessage im) 187 private void UndeliveredMessage(GridInstantMessage im)
184 { 188 {
185 if (im.offline != 0) 189 if ((im.offline != 0)
190 && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages)))
186 { 191 {
187 bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>( 192 bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>(
188 "POST", m_RestURL+"/SaveMessage/", im); 193 "POST", m_RestURL+"/SaveMessage/", im);
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 1cf96b0..0667047 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -473,6 +473,7 @@
473 ; OfflineMessageURL = http://yourserver/Offline.php 473 ; OfflineMessageURL = http://yourserver/Offline.php
474 ; MuteListModule = MuteListModule 474 ; MuteListModule = MuteListModule
475 ; MuteListURL = http://yourserver/Mute.php 475 ; MuteListURL = http://yourserver/Mute.php
476 ; ForwardOfflineGroupMessages = true
476 477
477 478
478[ODEPhysicsSettings] 479[ODEPhysicsSettings]