List of friends now retrieved upon login. Configured and tested in standalone only.

1 files changed, 5 insertions, 3 deletions

diff --git a/OpenSim/Services/Friends/FriendsServiceBase.cs b/OpenSim/Services/Friends/FriendsServiceBase.cs
index cabe944..9858972 100644
--- a/OpenSim/Services/Friends/FriendsServiceBase.cs
+++ b/OpenSim/Services/Friends/FriendsServiceBase.cs
@@ -71,12 +71,14 @@ namespace OpenSim.Services.Friends
             //
             // We tried, but this doesn't exist. We can't proceed.
             //
-            if (dllName.Equals(String.Empty))
+            if (String.Empty.Equals(dllName))
                 throw new Exception("No StorageProvider configured");
 
-            string realm = friendsConfig.GetString("Realm", "Friends");
+            string realm = "Friends";
+            if (friendsConfig != null)
+                realm = friendsConfig.GetString("Realm", realm);
 
-            m_Database = LoadPlugin<IFriendsData>(dllName, new Object[] {connString, realm});
+            m_Database = LoadPlugin<IFriendsData>(dllName, new Object[] { connString, realm });
             if (m_Database == null)
                 throw new Exception("Could not find a storage interface in the given module");
         }