Merge branch 'master' into bulletsim

author: Dan Lake 2011-07-11 12:23:20 -0700
committer: Dan Lake 2011-07-11 12:23:20 -0700
commit: b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a (patch)
tree: 8fd2fa4567e2882e7f5dafdb8cf1de571917f23a /OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
parent: Checkin 32 bit bulletsim shared library for Linux. (diff)
parent: minor Tack the prim name on the end of the "experimental mesh proxy generatio... (diff)
download: opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.zip
opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.gz
opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.bz2
opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index daee4ca..3a7178c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -830,7 +830,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
        public bool LocalStatusNotification(UUID userID, UUID friendID, bool online)
        {
-            m_log.DebugFormat("[FRIENDS]: Local Status Notify {0} that user {1} is {2}", friendID, userID, online);
+//            m_log.DebugFormat("[FRIENDS]: Local Status Notify {0} that user {1} is {2}", friendID, userID, online);
            IClientAPI friendClient = LocateClientObject(friendID);
            if (friendClient != null)
            {
author	Dan Lake	2011-07-11 12:23:20 -0700
committer	Dan Lake	2011-07-11 12:23:20 -0700
commit	b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a (patch)
tree	8fd2fa4567e2882e7f5dafdb8cf1de571917f23a /OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
parent	Checkin 32 bit bulletsim shared library for Linux. (diff)
parent	minor Tack the prim name on the end of the "experimental mesh proxy generatio... (diff)
download	opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.zip opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.gz opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.bz2 opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.xz

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index daee4ca..3a7178c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -830,7 +830,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
830		830
831	public bool LocalStatusNotification(UUID userID, UUID friendID, bool online)	831	public bool LocalStatusNotification(UUID userID, UUID friendID, bool online)
832	{	832	{
833	m_log.DebugFormat("[FRIENDS]: Local Status Notify {0} that user {1} is {2}", friendID, userID, online);	833	// m_log.DebugFormat("[FRIENDS]: Local Status Notify {0} that user {1} is {2}", friendID, userID, online);
834	IClientAPI friendClient = LocateClientObject(friendID);	834	IClientAPI friendClient = LocateClientObject(friendID);
835	if (friendClient != null)	835	if (friendClient != null)
836	{	836	{