diff options
author | Diva Canto | 2011-05-24 09:38:03 -0700 |
---|---|---|
committer | Diva Canto | 2011-05-24 09:38:03 -0700 |
commit | e19031849ec2957f7312d7e2417bd8c8da0efc53 (patch) | |
tree | af29b1a7625422ef9b249537b1e5a17617ddbc7c /OpenSim/Services/HypergridService | |
parent | HG friends: Status notifications working. Also initial logins get the online ... (diff) | |
download | opensim-SC_OLD-e19031849ec2957f7312d7e2417bd8c8da0efc53.zip opensim-SC_OLD-e19031849ec2957f7312d7e2417bd8c8da0efc53.tar.gz opensim-SC_OLD-e19031849ec2957f7312d7e2417bd8c8da0efc53.tar.bz2 opensim-SC_OLD-e19031849ec2957f7312d7e2417bd8c8da0efc53.tar.xz |
Added necessary code to drop inventory on hg friends using the profile window, but can't test because this mechanism doesn't seem to work without a profile service.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 0181533..e63f941 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -67,6 +67,7 @@ namespace OpenSim.Services.HypergridService | |||
67 | protected static IGatekeeperService m_GatekeeperService; | 67 | protected static IGatekeeperService m_GatekeeperService; |
68 | protected static IFriendsService m_FriendsService; | 68 | protected static IFriendsService m_FriendsService; |
69 | protected static IPresenceService m_PresenceService; | 69 | protected static IPresenceService m_PresenceService; |
70 | protected static IUserAccountService m_UserAccountService; | ||
70 | protected static IFriendsSimConnector m_FriendsLocalSimConnector; // standalone, points to HGFriendsModule | 71 | protected static IFriendsSimConnector m_FriendsLocalSimConnector; // standalone, points to HGFriendsModule |
71 | protected static FriendsSimConnector m_FriendsSimConnector; // grid | 72 | protected static FriendsSimConnector m_FriendsSimConnector; // grid |
72 | 73 | ||
@@ -102,6 +103,7 @@ namespace OpenSim.Services.HypergridService | |||
102 | string gatekeeperService = serverConfig.GetString("GatekeeperService", String.Empty); | 103 | string gatekeeperService = serverConfig.GetString("GatekeeperService", String.Empty); |
103 | string friendsService = serverConfig.GetString("FriendsService", String.Empty); | 104 | string friendsService = serverConfig.GetString("FriendsService", String.Empty); |
104 | string presenceService = serverConfig.GetString("PresenceService", String.Empty); | 105 | string presenceService = serverConfig.GetString("PresenceService", String.Empty); |
106 | string userAccountService = serverConfig.GetString("UserAccountService", String.Empty); | ||
105 | 107 | ||
106 | m_BypassClientVerification = serverConfig.GetBoolean("BypassClientVerification", false); | 108 | m_BypassClientVerification = serverConfig.GetBoolean("BypassClientVerification", false); |
107 | 109 | ||
@@ -115,6 +117,7 @@ namespace OpenSim.Services.HypergridService | |||
115 | m_GatekeeperService = ServerUtils.LoadPlugin<IGatekeeperService>(gatekeeperService, args); | 117 | m_GatekeeperService = ServerUtils.LoadPlugin<IGatekeeperService>(gatekeeperService, args); |
116 | m_FriendsService = ServerUtils.LoadPlugin<IFriendsService>(friendsService, args); | 118 | m_FriendsService = ServerUtils.LoadPlugin<IFriendsService>(friendsService, args); |
117 | m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args); | 119 | m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args); |
120 | m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(userAccountService, args); | ||
118 | 121 | ||
119 | m_GridName = serverConfig.GetString("ExternalName", string.Empty); | 122 | m_GridName = serverConfig.GetString("ExternalName", string.Empty); |
120 | if (m_GridName == string.Empty) | 123 | if (m_GridName == string.Empty) |
@@ -457,6 +460,20 @@ namespace OpenSim.Services.HypergridService | |||
457 | 460 | ||
458 | return online; | 461 | return online; |
459 | } | 462 | } |
463 | |||
464 | public Dictionary<string, object> GetServerURLs(UUID userID) | ||
465 | { | ||
466 | if (m_UserAccountService == null) | ||
467 | { | ||
468 | m_log.WarnFormat("[USER AGENT SERVICE]: Unable to get server URLs because user account service is missing"); | ||
469 | return new Dictionary<string, object>(); | ||
470 | } | ||
471 | UserAccount account = m_UserAccountService.GetUserAccount(UUID.Zero /*!!!*/, userID); | ||
472 | if (account != null) | ||
473 | return account.ServiceURLs; | ||
474 | |||
475 | return new Dictionary<string, object>(); | ||
476 | } | ||
460 | } | 477 | } |
461 | 478 | ||
462 | class TravelingAgentInfo | 479 | class TravelingAgentInfo |