diff options
| author | Tom Grimshaw | 2010-06-29 23:19:08 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-06-29 23:19:08 -0700 |
| commit | 9012084d1192cd98c367c6c9682b69f9d49af069 (patch) | |
| tree | 27ba292f6915010ea373fc1b6d278c9904ea53db /OpenSim/Region/CoreModules | |
| parent | The other half of the asset fix. Implement an exponentially incrementing retr... (diff) | |
| parent | Comment the "Notecard saved" notification that pops up when a notecard (diff) | |
| download | opensim-SC_OLD-9012084d1192cd98c367c6c9682b69f9d49af069.zip opensim-SC_OLD-9012084d1192cd98c367c6c9682b69f9d49af069.tar.gz opensim-SC_OLD-9012084d1192cd98c367c6c9682b69f9d49af069.tar.bz2 opensim-SC_OLD-9012084d1192cd98c367c6c9682b69f9d49af069.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | 4 |
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 | { |