OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
avinationmerge
Melanie 2010-12-26 07:29:23 +01:00
parent b17150c3e8
commit 8186bf2525
2 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
View File

@ -156,31 +156,32 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
return; return;
} }
DateTime dt = DateTime.UtcNow; //DateTime dt = DateTime.UtcNow;
// Ticks from UtcNow, but make it look like local. Evil, huh? // Ticks from UtcNow, but make it look like local. Evil, huh?
dt = DateTime.SpecifyKind(dt, DateTimeKind.Local); //dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
try //try
{ //{
// Convert that to the PST timezone // // Convert that to the PST timezone
TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles"); // TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles");
dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo); // dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo);
} //}
catch //catch
{ //{
//m_log.Info("[OFFLINE MESSAGING]: No PST timezone found on this machine. Saving with local timestamp."); // //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 //// And make it look local again to fool the unix time util
dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc); //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 is null, this message comes from storage and IS offline
if (client != null) if (client != null)
im.offline = 0; im.offline = 0;
if (im.offline == 0)
im.timestamp = (uint)Util.UnixTimeSinceEpoch();
if (m_TransferModule != null) if (m_TransferModule != null)
{ {
if (client != null) if (client != null)

38
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -3283,26 +3283,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); // m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); // m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
DateTime dt = DateTime.UtcNow; // DateTime dt = DateTime.UtcNow;
//
// // 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
// {
// // No logging here, as it could be VERY spammy
// }
//
// // And make it look local again to fool the unix time util
// dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
// Ticks from UtcNow, but make it look like local. Evil, huh? msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
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
{
// No logging here, as it could be VERY spammy
}
// And make it look local again to fool the unix time util
dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
msg.timestamp = (uint)Util.ToUnixTime(dt);
//if (client != null) //if (client != null)
//{ //{