Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

author: meta7 2010-08-07 06:33:51 -0700
committer: meta7 2010-08-07 06:33:51 -0700
commit: bcb3b57f8dad06b2df1e84900da9a63253fa5a8e (patch)
tree: c081310d6b2c6ebf1636c52a91c6b02dd4b37acf /OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
parent: Add a CHANGED_POSITION event so scripts don't have to run expensive loops to ... (diff)
parent: and another one... (diff)
download: opensim-SC-bcb3b57f8dad06b2df1e84900da9a63253fa5a8e.zip
opensim-SC-bcb3b57f8dad06b2df1e84900da9a63253fa5a8e.tar.gz
opensim-SC-bcb3b57f8dad06b2df1e84900da9a63253fa5a8e.tar.bz2
opensim-SC-bcb3b57f8dad06b2df1e84900da9a63253fa5a8e.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index cbea54c..1603c07 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
            }
            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
author	meta7	2010-08-07 06:33:51 -0700
committer	meta7	2010-08-07 06:33:51 -0700
commit	bcb3b57f8dad06b2df1e84900da9a63253fa5a8e (patch)
tree	c081310d6b2c6ebf1636c52a91c6b02dd4b37acf /OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
parent	Add a CHANGED_POSITION event so scripts don't have to run expensive loops to ... (diff)
parent	and another one... (diff)
download	opensim-SC-bcb3b57f8dad06b2df1e84900da9a63253fa5a8e.zip opensim-SC-bcb3b57f8dad06b2df1e84900da9a63253fa5a8e.tar.gz opensim-SC-bcb3b57f8dad06b2df1e84900da9a63253fa5a8e.tar.bz2 opensim-SC-bcb3b57f8dad06b2df1e84900da9a63253fa5a8e.tar.xz

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs index cbea54c..1603c07 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
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