From 679ad9575083370204a6d83e9933323c9f60ae45 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 25 Feb 2010 16:11:04 -0800 Subject: List of friends now retrieved upon login. Configured and tested in standalone only. --- OpenSim/Services/Friends/FriendsServiceBase.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'OpenSim/Services/Friends/FriendsServiceBase.cs') 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(dllName, new Object[] {connString, realm}); + m_Database = LoadPlugin(dllName, new Object[] { connString, realm }); if (m_Database == null) throw new Exception("Could not find a storage interface in the given module"); } -- cgit v1.1