aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2010-06-28 08:58:51 +0200
committerMelanie Thielker2010-06-28 08:58:51 +0200
commit3e908023b2f7e9edb77687089f2363a77b13d1fc (patch)
tree52b90c2d9ebea1581886b6c1843399023e7f1e75
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC-3e908023b2f7e9edb77687089f2363a77b13d1fc.zip
opensim-SC-3e908023b2f7e9edb77687089f2363a77b13d1fc.tar.gz
opensim-SC-3e908023b2f7e9edb77687089f2363a77b13d1fc.tar.bz2
opensim-SC-3e908023b2f7e9edb77687089f2363a77b13d1fc.tar.xz
Force IM timestamps to current server time to prevent "Saved on" headers
while the sender is online
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 2dc7384..a7aa4ea 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -156,6 +156,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
156 return; 156 return;
157 } 157 }
158 158
159 // Force timestamp to server time to avoid "Saved on" headers
160 // being generated for online users
161 im.timestamp = (uint)Util.UnixTimeSinceEpoch();
162
159 if (dialog == (byte)InstantMessageDialog.MessageFromAgent || 163 if (dialog == (byte)InstantMessageDialog.MessageFromAgent ||
160 dialog == (byte)InstantMessageDialog.MessageFromObject) 164 dialog == (byte)InstantMessageDialog.MessageFromObject)
161 { 165 {