diff options
Diffstat (limited to 'OpenSim/Services/HypergridService')
11 files changed, 41 insertions, 41 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 41e2b40..b80700f 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -93,7 +93,7 @@ namespace OpenSim.Services.HypergridService | |||
93 | // These are mandatory, the others aren't | 93 | // These are mandatory, the others aren't |
94 | if (gridService == string.Empty || presenceService == string.Empty) | 94 | if (gridService == string.Empty || presenceService == string.Empty) |
95 | throw new Exception("Incomplete specifications, Gatekeeper Service cannot function."); | 95 | throw new Exception("Incomplete specifications, Gatekeeper Service cannot function."); |
96 | 96 | ||
97 | string scope = serverConfig.GetString("ScopeID", UUID.Zero.ToString()); | 97 | string scope = serverConfig.GetString("ScopeID", UUID.Zero.ToString()); |
98 | UUID.TryParse(scope, out m_ScopeID); | 98 | UUID.TryParse(scope, out m_ScopeID); |
99 | //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!"); | 99 | //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!"); |
@@ -135,7 +135,7 @@ namespace OpenSim.Services.HypergridService | |||
135 | m_AllowedClients = Util.GetConfigVarFromSections<string>( | 135 | m_AllowedClients = Util.GetConfigVarFromSections<string>( |
136 | config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); | 136 | config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); |
137 | m_DeniedClients = Util.GetConfigVarFromSections<string>( | 137 | m_DeniedClients = Util.GetConfigVarFromSections<string>( |
138 | config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); | 138 | config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); |
139 | m_ForeignAgentsAllowed = serverConfig.GetBoolean("ForeignAgentsAllowed", true); | 139 | m_ForeignAgentsAllowed = serverConfig.GetBoolean("ForeignAgentsAllowed", true); |
140 | 140 | ||
141 | LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_ForeignsAllowedExceptions); | 141 | LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_ForeignsAllowedExceptions); |
@@ -219,11 +219,11 @@ namespace OpenSim.Services.HypergridService | |||
219 | { | 219 | { |
220 | // Don't even check the given regionID | 220 | // Don't even check the given regionID |
221 | m_log.DebugFormat( | 221 | m_log.DebugFormat( |
222 | "[GATEKEEPER SERVICE]: Returning gateway region {0} {1} @ {2} to user {3}{4} as teleporting to arbitrary regions is not allowed.", | 222 | "[GATEKEEPER SERVICE]: Returning gateway region {0} {1} @ {2} to user {3}{4} as teleporting to arbitrary regions is not allowed.", |
223 | m_DefaultGatewayRegion.RegionName, | 223 | m_DefaultGatewayRegion.RegionName, |
224 | m_DefaultGatewayRegion.RegionID, | 224 | m_DefaultGatewayRegion.RegionID, |
225 | m_DefaultGatewayRegion.ServerURI, | 225 | m_DefaultGatewayRegion.ServerURI, |
226 | agentID, | 226 | agentID, |
227 | agentHomeURI == null ? "" : " @ " + agentHomeURI); | 227 | agentHomeURI == null ? "" : " @ " + agentHomeURI); |
228 | 228 | ||
229 | message = "Teleporting to the default region."; | 229 | message = "Teleporting to the default region."; |
@@ -244,10 +244,10 @@ namespace OpenSim.Services.HypergridService | |||
244 | 244 | ||
245 | m_log.DebugFormat( | 245 | m_log.DebugFormat( |
246 | "[GATEKEEPER SERVICE]: Returning region {0} {1} @ {2} to user {3}{4}.", | 246 | "[GATEKEEPER SERVICE]: Returning region {0} {1} @ {2} to user {3}{4}.", |
247 | region.RegionName, | 247 | region.RegionName, |
248 | region.RegionID, | 248 | region.RegionID, |
249 | region.ServerURI, | 249 | region.ServerURI, |
250 | agentID, | 250 | agentID, |
251 | agentHomeURI == null ? "" : " @ " + agentHomeURI); | 251 | agentHomeURI == null ? "" : " @ " + agentHomeURI); |
252 | 252 | ||
253 | return region; | 253 | return region; |
@@ -308,7 +308,7 @@ namespace OpenSim.Services.HypergridService | |||
308 | return false; | 308 | return false; |
309 | } | 309 | } |
310 | m_log.DebugFormat("[GATEKEEPER SERVICE]: Identity verified for {0} {1} @ {2}", aCircuit.firstname, aCircuit.lastname, authURL); | 310 | m_log.DebugFormat("[GATEKEEPER SERVICE]: Identity verified for {0} {1} @ {2}", aCircuit.firstname, aCircuit.lastname, authURL); |
311 | 311 | ||
312 | // | 312 | // |
313 | // Check for impersonations | 313 | // Check for impersonations |
314 | // | 314 | // |
@@ -461,7 +461,7 @@ namespace OpenSim.Services.HypergridService | |||
461 | EntityTransferContext ctx = new EntityTransferContext(); | 461 | EntityTransferContext ctx = new EntityTransferContext(); |
462 | 462 | ||
463 | if (!m_SimulationService.QueryAccess( | 463 | if (!m_SimulationService.QueryAccess( |
464 | destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(), | 464 | destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(), |
465 | true, aCircuit.startpos, new List<UUID>(), ctx, out reason)) | 465 | true, aCircuit.startpos, new List<UUID>(), ctx, out reason)) |
466 | return false; | 466 | return false; |
467 | 467 | ||
@@ -495,7 +495,7 @@ namespace OpenSim.Services.HypergridService | |||
495 | } | 495 | } |
496 | else | 496 | else |
497 | { | 497 | { |
498 | IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); | 498 | IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); |
499 | 499 | ||
500 | try | 500 | try |
501 | { | 501 | { |
diff --git a/OpenSim/Services/HypergridService/HGAssetService.cs b/OpenSim/Services/HypergridService/HGAssetService.cs index b83fb1e..a66478e 100644 --- a/OpenSim/Services/HypergridService/HGAssetService.cs +++ b/OpenSim/Services/HypergridService/HGAssetService.cs | |||
@@ -164,7 +164,7 @@ namespace OpenSim.Services.HypergridService | |||
164 | return false; | 164 | return false; |
165 | } | 165 | } |
166 | 166 | ||
167 | #endregion | 167 | #endregion |
168 | 168 | ||
169 | protected void AdjustIdentifiers(AssetMetadata meta) | 169 | protected void AdjustIdentifiers(AssetMetadata meta) |
170 | { | 170 | { |
diff --git a/OpenSim/Services/HypergridService/HGFSAssetService.cs b/OpenSim/Services/HypergridService/HGFSAssetService.cs index 54e8ccb..2b30b3a 100644 --- a/OpenSim/Services/HypergridService/HGFSAssetService.cs +++ b/OpenSim/Services/HypergridService/HGFSAssetService.cs | |||
@@ -160,7 +160,7 @@ namespace OpenSim.Services.HypergridService | |||
160 | return false; | 160 | return false; |
161 | } | 161 | } |
162 | 162 | ||
163 | #endregion | 163 | #endregion |
164 | 164 | ||
165 | protected void AdjustIdentifiers(AssetMetadata meta) | 165 | protected void AdjustIdentifiers(AssetMetadata meta) |
166 | { | 166 | { |
diff --git a/OpenSim/Services/HypergridService/HGFriendsService.cs b/OpenSim/Services/HypergridService/HGFriendsService.cs index 6e35a88..d3b4f18 100644 --- a/OpenSim/Services/HypergridService/HGFriendsService.cs +++ b/OpenSim/Services/HypergridService/HGFriendsService.cs | |||
@@ -227,7 +227,7 @@ namespace OpenSim.Services.HypergridService | |||
227 | 227 | ||
228 | List<UUID> localFriendsOnline = new List<UUID>(); | 228 | List<UUID> localFriendsOnline = new List<UUID>(); |
229 | 229 | ||
230 | m_log.DebugFormat("[HGFRIENDS SERVICE]: Status notification: foreign user {0} wants to notify {1} local friends of {2} status", | 230 | m_log.DebugFormat("[HGFRIENDS SERVICE]: Status notification: foreign user {0} wants to notify {1} local friends of {2} status", |
231 | foreignUserID, friends.Count, (online ? "online" : "offline")); | 231 | foreignUserID, friends.Count, (online ? "online" : "offline")); |
232 | 232 | ||
233 | // First, let's double check that the reported friends are, indeed, friends of that user | 233 | // First, let's double check that the reported friends are, indeed, friends of that user |
diff --git a/OpenSim/Services/HypergridService/HGInstantMessageService.cs b/OpenSim/Services/HypergridService/HGInstantMessageService.cs index 32ca09a..d1739cf 100644 --- a/OpenSim/Services/HypergridService/HGInstantMessageService.cs +++ b/OpenSim/Services/HypergridService/HGInstantMessageService.cs | |||
@@ -184,7 +184,7 @@ namespace OpenSim.Services.HypergridService | |||
184 | else if (o is string) | 184 | else if (o is string) |
185 | url = (string)o; | 185 | url = (string)o; |
186 | 186 | ||
187 | // We need to compare the current location with the previous | 187 | // We need to compare the current location with the previous |
188 | // or the recursive loop will never end because it will never try to lookup the agent again | 188 | // or the recursive loop will never end because it will never try to lookup the agent again |
189 | if (!firstTime) | 189 | if (!firstTime) |
190 | { | 190 | { |
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs index a0d25e3..f14593e 100644 --- a/OpenSim/Services/HypergridService/HGInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGInventoryService.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim.Services.HypergridService | |||
70 | // | 70 | // |
71 | IConfig invConfig = config.Configs[m_ConfigName]; | 71 | IConfig invConfig = config.Configs[m_ConfigName]; |
72 | if (invConfig != null) | 72 | if (invConfig != null) |
73 | { | 73 | { |
74 | // realm = authConfig.GetString("Realm", realm); | 74 | // realm = authConfig.GetString("Realm", realm); |
75 | string userAccountsDll = invConfig.GetString("UserAccountsService", string.Empty); | 75 | string userAccountsDll = invConfig.GetString("UserAccountsService", string.Empty); |
76 | if (userAccountsDll == string.Empty) | 76 | if (userAccountsDll == string.Empty) |
@@ -82,7 +82,7 @@ namespace OpenSim.Services.HypergridService | |||
82 | throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll)); | 82 | throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll)); |
83 | 83 | ||
84 | m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI", | 84 | m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI", |
85 | new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); | 85 | new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); |
86 | 86 | ||
87 | m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); | 87 | m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); |
88 | } | 88 | } |
@@ -113,7 +113,7 @@ namespace OpenSim.Services.HypergridService | |||
113 | 113 | ||
114 | if (folders.Length > 0) | 114 | if (folders.Length > 0) |
115 | return ConvertToOpenSim(folders[0]); | 115 | return ConvertToOpenSim(folders[0]); |
116 | 116 | ||
117 | // make one | 117 | // make one |
118 | XInventoryFolder suitcase = CreateFolder(principalID, UUID.Zero, (int)FolderType.Suitcase, "My Suitcase"); | 118 | XInventoryFolder suitcase = CreateFolder(principalID, UUID.Zero, (int)FolderType.Suitcase, "My Suitcase"); |
119 | return ConvertToOpenSim(suitcase); | 119 | return ConvertToOpenSim(suitcase); |
@@ -160,7 +160,7 @@ namespace OpenSim.Services.HypergridService | |||
160 | { | 160 | { |
161 | return new InventoryCollection[0]; | 161 | return new InventoryCollection[0]; |
162 | } | 162 | } |
163 | 163 | ||
164 | //public List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID) | 164 | //public List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID) |
165 | //{ | 165 | //{ |
166 | //} | 166 | //} |
diff --git a/OpenSim/Services/HypergridService/HGRemoteAssetService.cs b/OpenSim/Services/HypergridService/HGRemoteAssetService.cs index a53435b..5e98af9 100644 --- a/OpenSim/Services/HypergridService/HGRemoteAssetService.cs +++ b/OpenSim/Services/HypergridService/HGRemoteAssetService.cs | |||
@@ -196,7 +196,7 @@ namespace OpenSim.Services.HypergridService | |||
196 | return false; | 196 | return false; |
197 | } | 197 | } |
198 | 198 | ||
199 | #endregion | 199 | #endregion |
200 | 200 | ||
201 | protected void AdjustIdentifiers(AssetMetadata meta) | 201 | protected void AdjustIdentifiers(AssetMetadata meta) |
202 | { | 202 | { |
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs index 7f14e8e..d1f2e70 100644 --- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | |||
@@ -97,7 +97,7 @@ namespace OpenSim.Services.HypergridService | |||
97 | throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll)); | 97 | throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll)); |
98 | 98 | ||
99 | // m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI", | 99 | // m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI", |
100 | // new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); | 100 | // new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); |
101 | 101 | ||
102 | // m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); | 102 | // m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); |
103 | } | 103 | } |
@@ -318,7 +318,7 @@ namespace OpenSim.Services.HypergridService | |||
318 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveFolder: folder {0} (user {1}) is not within Suitcase tree", folder.ID, folder.Owner); | 318 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveFolder: folder {0} (user {1}) is not within Suitcase tree", folder.ID, folder.Owner); |
319 | return false; | 319 | return false; |
320 | } | 320 | } |
321 | 321 | ||
322 | if (!IsWithinSuitcaseTree(folder.Owner, folder.ParentID)) | 322 | if (!IsWithinSuitcaseTree(folder.Owner, folder.ParentID)) |
323 | { | 323 | { |
324 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveFolder: folder {0} (user {1}) is not within Suitcase tree", folder.ParentID, folder.Owner); | 324 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveFolder: folder {0} (user {1}) is not within Suitcase tree", folder.ParentID, folder.Owner); |
@@ -505,11 +505,11 @@ namespace OpenSim.Services.HypergridService | |||
505 | // Warp! Root folder for travelers | 505 | // Warp! Root folder for travelers |
506 | XInventoryFolder[] folders = m_Database.GetFolders( | 506 | XInventoryFolder[] folders = m_Database.GetFolders( |
507 | new string[] { "agentID", "type" }, | 507 | new string[] { "agentID", "type" }, |
508 | new string[] { principalID.ToString(), ((int)FolderType.Suitcase).ToString() }); | 508 | new string[] { principalID.ToString(), ((int)FolderType.Suitcase).ToString() }); |
509 | 509 | ||
510 | if (folders != null && folders.Length > 0) | 510 | if (folders != null && folders.Length > 0) |
511 | return folders[0]; | 511 | return folders[0]; |
512 | 512 | ||
513 | // check to see if we have the old Suitcase folder | 513 | // check to see if we have the old Suitcase folder |
514 | folders = m_Database.GetFolders( | 514 | folders = m_Database.GetFolders( |
515 | new string[] { "agentID", "folderName", "parentFolderID" }, | 515 | new string[] { "agentID", "folderName", "parentFolderID" }, |
@@ -629,7 +629,7 @@ namespace OpenSim.Services.HypergridService | |||
629 | { | 629 | { |
630 | if (a.Wearables[i][j].ItemID == itemID) | 630 | if (a.Wearables[i][j].ItemID == itemID) |
631 | { | 631 | { |
632 | //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is a wearable", itemID); | 632 | //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is a wearable", itemID); |
633 | return true; | 633 | return true; |
634 | } | 634 | } |
635 | } | 635 | } |
@@ -638,7 +638,7 @@ namespace OpenSim.Services.HypergridService | |||
638 | // Check attachments | 638 | // Check attachments |
639 | if (a.GetAttachmentForItem(itemID) != null) | 639 | if (a.GetAttachmentForItem(itemID) != null) |
640 | { | 640 | { |
641 | //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is an attachment", itemID); | 641 | //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is an attachment", itemID); |
642 | return true; | 642 | return true; |
643 | } | 643 | } |
644 | 644 | ||
diff --git a/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs b/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs index df4751e..31b9f4e 100644 --- a/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.HypergridService")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.HypergridService")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/HypergridService/UserAccountCache.cs b/OpenSim/Services/HypergridService/UserAccountCache.cs index 25ffb63..ae0f7ce 100644 --- a/OpenSim/Services/HypergridService/UserAccountCache.cs +++ b/OpenSim/Services/HypergridService/UserAccountCache.cs | |||
@@ -16,7 +16,7 @@ namespace OpenSim.Services.HypergridService | |||
16 | // private static readonly ILog m_log = | 16 | // private static readonly ILog m_log = |
17 | // LogManager.GetLogger( | 17 | // LogManager.GetLogger( |
18 | // MethodBase.GetCurrentMethod().DeclaringType); | 18 | // MethodBase.GetCurrentMethod().DeclaringType); |
19 | 19 | ||
20 | private ExpiringCache<UUID, UserAccount> m_UUIDCache; | 20 | private ExpiringCache<UUID, UserAccount> m_UUIDCache; |
21 | 21 | ||
22 | private IUserAccountService m_UserAccountService; | 22 | private IUserAccountService m_UserAccountService; |
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index e701ec6..ba3cb2f 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -219,7 +219,7 @@ namespace OpenSim.Services.HypergridService | |||
219 | 219 | ||
220 | public bool LoginAgentToGrid(GridRegion source, AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason) | 220 | public bool LoginAgentToGrid(GridRegion source, AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason) |
221 | { | 221 | { |
222 | m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", | 222 | m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", |
223 | agentCircuit.firstname, agentCircuit.lastname, (fromLogin ? agentCircuit.IPAddress : "stored IP"), gatekeeper.ServerURI); | 223 | agentCircuit.firstname, agentCircuit.lastname, (fromLogin ? agentCircuit.IPAddress : "stored IP"), gatekeeper.ServerURI); |
224 | 224 | ||
225 | string gridName = gatekeeper.ServerURI; | 225 | string gridName = gatekeeper.ServerURI; |
@@ -269,7 +269,7 @@ namespace OpenSim.Services.HypergridService | |||
269 | agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random(); | 269 | agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random(); |
270 | TravelingAgentInfo old = null; | 270 | TravelingAgentInfo old = null; |
271 | TravelingAgentInfo travel = CreateTravelInfo(agentCircuit, region, fromLogin, out old); | 271 | TravelingAgentInfo travel = CreateTravelInfo(agentCircuit, region, fromLogin, out old); |
272 | 272 | ||
273 | bool success = false; | 273 | bool success = false; |
274 | string myExternalIP = string.Empty; | 274 | string myExternalIP = string.Empty; |
275 | 275 | ||
@@ -288,7 +288,7 @@ namespace OpenSim.Services.HypergridService | |||
288 | 288 | ||
289 | if (!success) | 289 | if (!success) |
290 | { | 290 | { |
291 | m_log.DebugFormat("[USER AGENT SERVICE]: Unable to login user {0} {1} to grid {2}, reason: {3}", | 291 | m_log.DebugFormat("[USER AGENT SERVICE]: Unable to login user {0} {1} to grid {2}, reason: {3}", |
292 | agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason); | 292 | agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason); |
293 | 293 | ||
294 | if (old != null) | 294 | if (old != null) |
@@ -301,11 +301,11 @@ namespace OpenSim.Services.HypergridService | |||
301 | 301 | ||
302 | // Everything is ok | 302 | // Everything is ok |
303 | 303 | ||
304 | if (!fromLogin) | 304 | if (!fromLogin) |
305 | { | 305 | { |
306 | // Update the perceived IP Address of our grid | 306 | // Update the perceived IP Address of our grid |
307 | m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP); | 307 | m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP); |
308 | } | 308 | } |
309 | 309 | ||
310 | travel.MyIpAddress = myExternalIP; | 310 | travel.MyIpAddress = myExternalIP; |
311 | 311 | ||
@@ -376,7 +376,7 @@ namespace OpenSim.Services.HypergridService | |||
376 | if (m_BypassClientVerification) | 376 | if (m_BypassClientVerification) |
377 | return true; | 377 | return true; |
378 | 378 | ||
379 | m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with reported IP {1}.", | 379 | m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with reported IP {1}.", |
380 | sessionID, reportedIP); | 380 | sessionID, reportedIP); |
381 | 381 | ||
382 | HGTravelingData hgt = m_Database.Get(sessionID); | 382 | HGTravelingData hgt = m_Database.Get(sessionID); |
@@ -535,7 +535,7 @@ namespace OpenSim.Services.HypergridService | |||
535 | FriendInfo[] friendInfos = m_FriendsService.GetFriends(localUserID); | 535 | FriendInfo[] friendInfos = m_FriendsService.GetFriends(localUserID); |
536 | foreach (FriendInfo finfo in friendInfos) | 536 | foreach (FriendInfo finfo in friendInfos) |
537 | { | 537 | { |
538 | if (finfo.Friend.StartsWith(foreignUserID.ToString()) && finfo.Friend.EndsWith(secret) && | 538 | if (finfo.Friend.StartsWith(foreignUserID.ToString()) && finfo.Friend.EndsWith(secret) && |
539 | (finfo.TheirFlags & (int)FriendRights.CanSeeOnline) != 0 && (finfo.TheirFlags != -1)) | 539 | (finfo.TheirFlags & (int)FriendRights.CanSeeOnline) != 0 && (finfo.TheirFlags != -1)) |
540 | { | 540 | { |
541 | // great! | 541 | // great! |
@@ -641,7 +641,7 @@ namespace OpenSim.Services.HypergridService | |||
641 | foreach (FriendInfo f in friends) | 641 | foreach (FriendInfo f in friends) |
642 | if (f.Friend.StartsWith(targetUserID.ToString())) | 642 | if (f.Friend.StartsWith(targetUserID.ToString())) |
643 | { | 643 | { |
644 | // Let's remove the secret | 644 | // Let's remove the secret |
645 | UUID id; string tmp = string.Empty, secret = string.Empty; | 645 | UUID id; string tmp = string.Empty, secret = string.Empty; |
646 | if (Util.ParseUniversalUserIdentifier(f.Friend, out id, out tmp, out tmp, out tmp, out secret)) | 646 | if (Util.ParseUniversalUserIdentifier(f.Friend, out id, out tmp, out tmp, out tmp, out secret)) |
647 | return f.Friend.Replace(secret, "0"); | 647 | return f.Friend.Replace(secret, "0"); |