aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-12-26 07:29:23 +0100
committerMelanie2010-12-26 07:29:23 +0100
commit8186bf25253924e80c640ba03432d3b6211a4d41 (patch)
treeeef1525438d07b76f88bf18354719c99dc2ec942 /OpenSim
parentFix the corner casse of stack overflow when logging out with attachments (diff)
downloadopensim-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')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs37
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs40
2 files changed, 39 insertions, 38 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)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index f06fd24..613d704 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3283,26 +3283,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3283 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here 3283 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
3284// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); 3284// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
3285// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); 3285// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
3286 DateTime dt = DateTime.UtcNow; 3286// DateTime dt = DateTime.UtcNow;
3287 3287//
3288 // Ticks from UtcNow, but make it look like local. Evil, huh? 3288// // Ticks from UtcNow, but make it look like local. Evil, huh?
3289 dt = DateTime.SpecifyKind(dt, DateTimeKind.Local); 3289// dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
3290 3290//
3291 try 3291// try
3292 { 3292// {
3293 // Convert that to the PST timezone 3293// // Convert that to the PST timezone
3294 TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles"); 3294// TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles");
3295 dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo); 3295// dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo);
3296 } 3296// }
3297 catch 3297// catch
3298 { 3298// {
3299 // No logging here, as it could be VERY spammy 3299// // No logging here, as it could be VERY spammy
3300 } 3300// }
3301 3301//
3302 // And make it look local again to fool the unix time util 3302// // And make it look local again to fool the unix time util
3303 dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc); 3303// dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
3304 3304
3305 msg.timestamp = (uint)Util.ToUnixTime(dt); 3305 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
3306 3306
3307 //if (client != null) 3307 //if (client != null)
3308 //{ 3308 //{