diff options
author | Melanie | 2010-12-26 07:29:23 +0100 |
---|---|---|
committer | Melanie | 2010-12-26 07:29:23 +0100 |
commit | 8186bf25253924e80c640ba03432d3b6211a4d41 (patch) | |
tree | eef1525438d07b76f88bf18354719c99dc2ec942 /OpenSim/Region/CoreModules/Avatar/InstantMessage | |
parent | Fix the corner casse of stack overflow when logging out with attachments (diff) | |
download | opensim-SC_OLD-8186bf25253924e80c640ba03432d3b6211a4d41.zip opensim-SC_OLD-8186bf25253924e80c640ba03432d3b6211a4d41.tar.gz opensim-SC_OLD-8186bf25253924e80c640ba03432d3b6211a4d41.tar.bz2 opensim-SC_OLD-8186bf25253924e80c640ba03432d3b6211a4d41.tar.xz |
Remove some code that was meant to fool the viewer into thinking SLT. It never
worked and it turned out the issues were really in the backend.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs index 347708d..feb5fb8 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | |||
@@ -156,31 +156,32 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
156 | return; | 156 | return; |
157 | } | 157 | } |
158 | 158 | ||
159 | DateTime dt = DateTime.UtcNow; | 159 | //DateTime dt = DateTime.UtcNow; |
160 | 160 | ||
161 | // Ticks from UtcNow, but make it look like local. Evil, huh? | 161 | // Ticks from UtcNow, but make it look like local. Evil, huh? |
162 | dt = DateTime.SpecifyKind(dt, DateTimeKind.Local); | 162 | //dt = DateTime.SpecifyKind(dt, DateTimeKind.Local); |
163 | 163 | ||
164 | try | 164 | //try |
165 | { | 165 | //{ |
166 | // Convert that to the PST timezone | 166 | // // Convert that to the PST timezone |
167 | TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles"); | 167 | // TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles"); |
168 | dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo); | 168 | // dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo); |
169 | } | 169 | //} |
170 | catch | 170 | //catch |
171 | { | 171 | //{ |
172 | //m_log.Info("[OFFLINE MESSAGING]: No PST timezone found on this machine. Saving with local timestamp."); | 172 | // //m_log.Info("[OFFLINE MESSAGING]: No PST timezone found on this machine. Saving with local timestamp."); |
173 | } | 173 | //} |
174 | 174 | ||
175 | // And make it look local again to fool the unix time util | 175 | //// And make it look local again to fool the unix time util |
176 | dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc); | 176 | //dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc); |
177 | |||
178 | im.timestamp = (uint)Util.ToUnixTime(dt); | ||
179 | 177 | ||
180 | // If client is null, this message comes from storage and IS offline | 178 | // If client is null, this message comes from storage and IS offline |
181 | if (client != null) | 179 | if (client != null) |
182 | im.offline = 0; | 180 | im.offline = 0; |
183 | 181 | ||
182 | if (im.offline == 0) | ||
183 | im.timestamp = (uint)Util.UnixTimeSinceEpoch(); | ||
184 | |||
184 | if (m_TransferModule != null) | 185 | if (m_TransferModule != null) |
185 | { | 186 | { |
186 | if (client != null) | 187 | if (client != null) |