1 files changed, 21 insertions, 6 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index a7aa4ea..ffdac58 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -156,16 +156,31 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 return;
             }
 
-            // Force timestamp to server time to avoid "Saved on" headers
-            // being generated for online users
-            im.timestamp = (uint)Util.UnixTimeSinceEpoch();
+            DateTime dt = DateTime.UtcNow;
 
-            if (dialog == (byte)InstantMessageDialog.MessageFromAgent ||
-                dialog == (byte)InstantMessageDialog.MessageFromObject)
+            // Ticks from UtcNow, but make it look like local. Evil, huh?
+            dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
+
+            try
+            {
+                // Convert that to the PST timezone
+                TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles");
+                dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo);
+            }
+            catch
             {
-                im.offline = 1;
+                m_log.Info("[OFFLINE MESSAGING]: No PST timezone found on this machine. Saving with local timestamp.");
             }
 
+            // And make it look local again to fool the unix time util
+            dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
+
+            im.timestamp = (uint)Util.ToUnixTime(dt);
+
+            // If client is null, this message comes from storage and IS offline
+            if (client != null)
+                im.offline = 0;
+
             if (m_TransferModule != null)
             {
                 m_TransferModule.SendInstantMessage(im,