diff options
| author | Melanie | 2011-06-09 02:05:04 +0100 |
|---|---|---|
| committer | Melanie | 2011-06-09 02:05:04 +0100 |
| commit | 326c46ba70cea70ddfe4aef9a6b73edff63e126a (patch) | |
| tree | 5e76347b0d77f58717d8e5e4f3b8787ff01a18d7 /OpenSim/Server/Handlers/Friends/FriendServerConnector.cs | |
| parent | Make the last otem in a list created with llCSV2List findable (diff) | |
| parent | Consistency fix on the last commit. (diff) | |
| download | opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.zip opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.gz opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.bz2 opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Server/Handlers/Friends/FriendServerConnector.cs')
| -rw-r--r-- | OpenSim/Server/Handlers/Friends/FriendServerConnector.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Friends/FriendServerConnector.cs b/OpenSim/Server/Handlers/Friends/FriendServerConnector.cs index 074f869..5784bdf 100644 --- a/OpenSim/Server/Handlers/Friends/FriendServerConnector.cs +++ b/OpenSim/Server/Handlers/Friends/FriendServerConnector.cs | |||
| @@ -46,14 +46,14 @@ namespace OpenSim.Server.Handlers.Friends | |||
| 46 | if (serverConfig == null) | 46 | if (serverConfig == null) |
| 47 | throw new Exception(String.Format("No section {0} in config file", m_ConfigName)); | 47 | throw new Exception(String.Format("No section {0} in config file", m_ConfigName)); |
| 48 | 48 | ||
| 49 | string gridService = serverConfig.GetString("LocalServiceModule", | 49 | string theService = serverConfig.GetString("LocalServiceModule", |
| 50 | String.Empty); | 50 | String.Empty); |
| 51 | 51 | ||
| 52 | if (gridService == String.Empty) | 52 | if (theService == String.Empty) |
| 53 | throw new Exception("No LocalServiceModule in config file"); | 53 | throw new Exception("No LocalServiceModule in config file"); |
| 54 | 54 | ||
| 55 | Object[] args = new Object[] { config }; | 55 | Object[] args = new Object[] { config }; |
| 56 | m_FriendsService = ServerUtils.LoadPlugin<IFriendsService>(gridService, args); | 56 | m_FriendsService = ServerUtils.LoadPlugin<IFriendsService>(theService, args); |
| 57 | 57 | ||
| 58 | server.AddStreamHandler(new FriendsServerPostHandler(m_FriendsService)); | 58 | server.AddStreamHandler(new FriendsServerPostHandler(m_FriendsService)); |
| 59 | } | 59 | } |