diff options
author | Diva Canto | 2015-05-10 21:49:24 -0700 |
---|---|---|
committer | Diva Canto | 2015-05-10 21:49:24 -0700 |
commit | eb9b16d2849de438f20bb269ef3ea93e33f4d18d (patch) | |
tree | 928b4b92efa3d7fc42fd431fecdd0fa5895bbebb /OpenSim/Services/HypergridService/HGInstantMessageService.cs | |
parent | Added this form that comes handy for testing the grid service in Robust. (diff) | |
download | opensim-SC-eb9b16d2849de438f20bb269ef3ea93e33f4d18d.zip opensim-SC-eb9b16d2849de438f20bb269ef3ea93e33f4d18d.tar.gz opensim-SC-eb9b16d2849de438f20bb269ef3ea93e33f4d18d.tar.bz2 opensim-SC-eb9b16d2849de438f20bb269ef3ea93e33f4d18d.tar.xz |
Added simple test for IM in Robust too.
Changed Inventory data to use the mock one in Common Tests. (but still not inventory tests)
Diffstat (limited to 'OpenSim/Services/HypergridService/HGInstantMessageService.cs')
-rw-r--r-- | OpenSim/Services/HypergridService/HGInstantMessageService.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/HGInstantMessageService.cs b/OpenSim/Services/HypergridService/HGInstantMessageService.cs index 9b7b278..dde0e6c 100644 --- a/OpenSim/Services/HypergridService/HGInstantMessageService.cs +++ b/OpenSim/Services/HypergridService/HGInstantMessageService.cs | |||
@@ -101,7 +101,14 @@ namespace OpenSim.Services.HypergridService | |||
101 | Object[] args = new Object[] { config }; | 101 | Object[] args = new Object[] { config }; |
102 | m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args); | 102 | m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args); |
103 | m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args); | 103 | m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args); |
104 | m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(userAgentService, args); | 104 | try |
105 | { | ||
106 | m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(userAgentService, args); | ||
107 | } | ||
108 | catch (Exception e) | ||
109 | { | ||
110 | m_log.WarnFormat("[HG IM SERVICE]: Unable to create User Agent Service. Missing config var in [HGInstantMessageService]?"); | ||
111 | } | ||
105 | 112 | ||
106 | m_RegionCache = new ExpiringCache<UUID, GridRegion>(); | 113 | m_RegionCache = new ExpiringCache<UUID, GridRegion>(); |
107 | 114 | ||