Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

mysql-performance
Melanie 2010-01-08 05:31:31 +00:00
commit bba557aff6
2 changed files with 7 additions and 1 deletions

View File

@ -47,6 +47,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
private bool enabled = true; private bool enabled = true;
private List<Scene> m_SceneList = new List<Scene>(); private List<Scene> m_SceneList = new List<Scene>();
private string m_RestURL = String.Empty; private string m_RestURL = String.Empty;
private bool m_ForwardOfflineGroupMessages = true;
public void Initialise(Scene scene, IConfigSource config) public void Initialise(Scene scene, IConfigSource config)
{ {
@ -67,6 +68,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
return; return;
} }
if (cnf != null)
m_ForwardOfflineGroupMessages = cnf.GetBoolean("ForwardOfflineGroupMessages", m_ForwardOfflineGroupMessages);
lock (m_SceneList) lock (m_SceneList)
{ {
if (m_SceneList.Count == 0) if (m_SceneList.Count == 0)
@ -182,7 +186,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
private void UndeliveredMessage(GridInstantMessage im) private void UndeliveredMessage(GridInstantMessage im)
{ {
if (im.offline != 0) if ((im.offline != 0)
&& (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages)))
{ {
bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>( bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>(
"POST", m_RestURL+"/SaveMessage/", im); "POST", m_RestURL+"/SaveMessage/", im);

View File

@ -473,6 +473,7 @@
; OfflineMessageURL = http://yourserver/Offline.php ; OfflineMessageURL = http://yourserver/Offline.php
; MuteListModule = MuteListModule ; MuteListModule = MuteListModule
; MuteListURL = http://yourserver/Mute.php ; MuteListURL = http://yourserver/Mute.php
; ForwardOfflineGroupMessages = true
[ODEPhysicsSettings] [ODEPhysicsSettings]