From 27cdfb7b840423cf8cee08988dc487eeb34d71c7 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 08:47:45 -0700
Subject: HG Friends: debug an issue where the friends data stored in the DB is
 incomplete.

---
 OpenSim/Services/Friends/FriendsService.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Services/Friends')

diff --git a/OpenSim/Services/Friends/FriendsService.cs b/OpenSim/Services/Friends/FriendsService.cs
index e2033ac..dd3f733 100644
--- a/OpenSim/Services/Friends/FriendsService.cs
+++ b/OpenSim/Services/Friends/FriendsService.cs
@@ -29,6 +29,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using OpenSim.Services.Interfaces;
 using OpenSim.Data;
 using Nini.Config;
@@ -39,7 +40,12 @@ namespace OpenSim.Services.Friends
 {
     public class FriendsService : FriendsServiceBase, IFriendsService
     {
-        public FriendsService(IConfigSource config) : base(config)
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        public FriendsService(IConfigSource config)
+            : base(config)
         {
         }
 
@@ -98,6 +104,7 @@ namespace OpenSim.Services.Friends
             d.Data = new Dictionary<string, string>();
             d.Data["Flags"] = flags.ToString();
 
+            m_log.DebugFormat("[FRIENDS]: Storing {0} {1}", PrincipalID, Friend);
             return m_Database.Store(d);
         }
 
-- 
cgit v1.1


From 5eb78aad96f2dbaf7c4c0e5fa7e678076a2edbfc Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 09:17:01 -0700
Subject: Revert "HG Friends: debug an issue where the friends data stored in
 the DB is incomplete."

This reverts commit 27cdfb7b840423cf8cee08988dc487eeb34d71c7.
---
 OpenSim/Services/Friends/FriendsService.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'OpenSim/Services/Friends')

diff --git a/OpenSim/Services/Friends/FriendsService.cs b/OpenSim/Services/Friends/FriendsService.cs
index dd3f733..e2033ac 100644
--- a/OpenSim/Services/Friends/FriendsService.cs
+++ b/OpenSim/Services/Friends/FriendsService.cs
@@ -29,7 +29,6 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using OpenSim.Services.Interfaces;
 using OpenSim.Data;
 using Nini.Config;
@@ -40,12 +39,7 @@ namespace OpenSim.Services.Friends
 {
     public class FriendsService : FriendsServiceBase, IFriendsService
     {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
-
-        public FriendsService(IConfigSource config)
-            : base(config)
+        public FriendsService(IConfigSource config) : base(config)
         {
         }
 
@@ -104,7 +98,6 @@ namespace OpenSim.Services.Friends
             d.Data = new Dictionary<string, string>();
             d.Data["Flags"] = flags.ToString();
 
-            m_log.DebugFormat("[FRIENDS]: Storing {0} {1}", PrincipalID, Friend);
             return m_Database.Store(d);
         }
 
-- 
cgit v1.1


From 42bdf446585007029faf4cd21abd289487f0f797 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 4 Oct 2013 23:33:47 +0100
Subject: Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

---
 OpenSim/Services/Friends/Properties/AssemblyInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Services/Friends')

diff --git a/OpenSim/Services/Friends/Properties/AssemblyInfo.cs b/OpenSim/Services/Friends/Properties/AssemblyInfo.cs
index b11d07d..f9473e2 100644
--- a/OpenSim/Services/Friends/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/Friends/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
-- 
cgit v1.1