diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/UserProfiles')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs index 161f160..44edd7f 100644 --- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |||
@@ -304,7 +304,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
304 | } | 304 | } |
305 | 305 | ||
306 | string serverURI = string.Empty; | 306 | string serverURI = string.Empty; |
307 | bool foreign = GetUserProfileServerURI(targetID, out serverURI); | 307 | // bool foreign = GetUserProfileServerURI(targetID, out serverURI); |
308 | UUID creatorId = UUID.Zero; | 308 | UUID creatorId = UUID.Zero; |
309 | 309 | ||
310 | OSDMap parameters= new OSDMap(); | 310 | OSDMap parameters= new OSDMap(); |
@@ -369,7 +369,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
369 | } | 369 | } |
370 | 370 | ||
371 | string serverURI = string.Empty; | 371 | string serverURI = string.Empty; |
372 | bool foreign = GetUserProfileServerURI(target, out serverURI); | 372 | // bool foreign = GetUserProfileServerURI(target, out serverURI); |
373 | 373 | ||
374 | object Ad = (object)ad; | 374 | object Ad = (object)ad; |
375 | if(!JsonRpcRequest(ref Ad, "classifieds_info_query", serverURI, UUID.Random().ToString())) | 375 | if(!JsonRpcRequest(ref Ad, "classifieds_info_query", serverURI, UUID.Random().ToString())) |
@@ -438,10 +438,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
438 | Vector3 pos = remoteClient.SceneAgent.AbsolutePosition; | 438 | Vector3 pos = remoteClient.SceneAgent.AbsolutePosition; |
439 | ILandObject land = s.LandChannel.GetLandObject(pos.X, pos.Y); | 439 | ILandObject land = s.LandChannel.GetLandObject(pos.X, pos.Y); |
440 | ScenePresence p = FindPresence(remoteClient.AgentId); | 440 | ScenePresence p = FindPresence(remoteClient.AgentId); |
441 | Vector3 avaPos = p.AbsolutePosition; | ||
442 | 441 | ||
443 | string serverURI = string.Empty; | 442 | string serverURI = string.Empty; |
444 | bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | 443 | // bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); |
445 | 444 | ||
446 | if (land == null) | 445 | if (land == null) |
447 | { | 446 | { |
@@ -488,7 +487,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
488 | public void ClassifiedDelete(UUID queryClassifiedID, IClientAPI remoteClient) | 487 | public void ClassifiedDelete(UUID queryClassifiedID, IClientAPI remoteClient) |
489 | { | 488 | { |
490 | string serverURI = string.Empty; | 489 | string serverURI = string.Empty; |
491 | bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | 490 | // bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); |
492 | 491 | ||
493 | UUID classifiedId; | 492 | UUID classifiedId; |
494 | OSDMap parameters= new OSDMap(); | 493 | OSDMap parameters= new OSDMap(); |
@@ -538,7 +537,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
538 | } | 537 | } |
539 | 538 | ||
540 | string serverURI = string.Empty; | 539 | string serverURI = string.Empty; |
541 | bool foreign = GetUserProfileServerURI(targetId, out serverURI); | 540 | // bool foreign = GetUserProfileServerURI(targetId, out serverURI); |
542 | 541 | ||
543 | OSDMap parameters= new OSDMap(); | 542 | OSDMap parameters= new OSDMap(); |
544 | parameters.Add("creatorId", OSD.FromUUID(targetId)); | 543 | parameters.Add("creatorId", OSD.FromUUID(targetId)); |
@@ -589,7 +588,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
589 | UUID targetID; | 588 | UUID targetID; |
590 | UUID.TryParse(args[0], out targetID); | 589 | UUID.TryParse(args[0], out targetID); |
591 | string serverURI = string.Empty; | 590 | string serverURI = string.Empty; |
592 | bool foreign = GetUserProfileServerURI(targetID, out serverURI); | 591 | // bool foreign = GetUserProfileServerURI(targetID, out serverURI); |
593 | IClientAPI remoteClient = (IClientAPI)sender; | 592 | IClientAPI remoteClient = (IClientAPI)sender; |
594 | 593 | ||
595 | UserProfilePick pick = new UserProfilePick(); | 594 | UserProfilePick pick = new UserProfilePick(); |
@@ -657,7 +656,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
657 | m_log.DebugFormat("[PROFILES]: Start PickInfoUpdate Name: {0} PickId: {1} SnapshotId: {2}", name, pickID.ToString(), snapshotID.ToString()); | 656 | m_log.DebugFormat("[PROFILES]: Start PickInfoUpdate Name: {0} PickId: {1} SnapshotId: {2}", name, pickID.ToString(), snapshotID.ToString()); |
658 | UserProfilePick pick = new UserProfilePick(); | 657 | UserProfilePick pick = new UserProfilePick(); |
659 | string serverURI = string.Empty; | 658 | string serverURI = string.Empty; |
660 | bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | 659 | // bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); |
661 | ScenePresence p = FindPresence(remoteClient.AgentId); | 660 | ScenePresence p = FindPresence(remoteClient.AgentId); |
662 | 661 | ||
663 | Vector3 avaPos = p.AbsolutePosition; | 662 | Vector3 avaPos = p.AbsolutePosition; |
@@ -717,7 +716,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
717 | public void PickDelete(IClientAPI remoteClient, UUID queryPickID) | 716 | public void PickDelete(IClientAPI remoteClient, UUID queryPickID) |
718 | { | 717 | { |
719 | string serverURI = string.Empty; | 718 | string serverURI = string.Empty; |
720 | bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | 719 | // bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); |
721 | 720 | ||
722 | OSDMap parameters= new OSDMap(); | 721 | OSDMap parameters= new OSDMap(); |
723 | parameters.Add("pickId", OSD.FromUUID(queryPickID)); | 722 | parameters.Add("pickId", OSD.FromUUID(queryPickID)); |
@@ -752,7 +751,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
752 | 751 | ||
753 | IClientAPI remoteClient = (IClientAPI)sender; | 752 | IClientAPI remoteClient = (IClientAPI)sender; |
754 | string serverURI = string.Empty; | 753 | string serverURI = string.Empty; |
755 | bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | 754 | // bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); |
756 | note.TargetId = remoteClient.AgentId; | 755 | note.TargetId = remoteClient.AgentId; |
757 | UUID.TryParse(args[0], out note.UserId); | 756 | UUID.TryParse(args[0], out note.UserId); |
758 | 757 | ||
@@ -788,7 +787,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
788 | note.Notes = queryNotes; | 787 | note.Notes = queryNotes; |
789 | 788 | ||
790 | string serverURI = string.Empty; | 789 | string serverURI = string.Empty; |
791 | bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | 790 | // bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); |
792 | 791 | ||
793 | object Note = note; | 792 | object Note = note; |
794 | if(!JsonRpcRequest(ref Note, "avatar_notes_update", serverURI, UUID.Random().ToString())) | 793 | if(!JsonRpcRequest(ref Note, "avatar_notes_update", serverURI, UUID.Random().ToString())) |
@@ -833,7 +832,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
833 | prop.Language = languages; | 832 | prop.Language = languages; |
834 | 833 | ||
835 | string serverURI = string.Empty; | 834 | string serverURI = string.Empty; |
836 | bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | 835 | // bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); |
837 | 836 | ||
838 | object Param = prop; | 837 | object Param = prop; |
839 | if(!JsonRpcRequest(ref Param, "avatar_interests_update", serverURI, UUID.Random().ToString())) | 838 | if(!JsonRpcRequest(ref Param, "avatar_interests_update", serverURI, UUID.Random().ToString())) |
@@ -955,7 +954,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
955 | prop.FirstLifeText = newProfile.FirstLifeAboutText; | 954 | prop.FirstLifeText = newProfile.FirstLifeAboutText; |
956 | 955 | ||
957 | string serverURI = string.Empty; | 956 | string serverURI = string.Empty; |
958 | bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | 957 | // bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); |
959 | 958 | ||
960 | object Prop = prop; | 959 | object Prop = prop; |
961 | 960 | ||
@@ -994,7 +993,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
994 | } | 993 | } |
995 | 994 | ||
996 | string serverURI = string.Empty; | 995 | string serverURI = string.Empty; |
997 | bool foreign = GetUserProfileServerURI(properties.UserId, out serverURI); | 996 | // bool foreign = GetUserProfileServerURI(properties.UserId, out serverURI); |
998 | 997 | ||
999 | // This is checking a friend on the home grid | 998 | // This is checking a friend on the home grid |
1000 | // Not HG friend | 999 | // Not HG friend |
@@ -1247,7 +1246,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
1247 | return false; | 1246 | return false; |
1248 | } | 1247 | } |
1249 | 1248 | ||
1250 | byte[] buf = new byte[8192]; | ||
1251 | Stream rstream = webResponse.GetResponseStream(); | 1249 | Stream rstream = webResponse.GetResponseStream(); |
1252 | OSDMap mret = (OSDMap)OSDParser.DeserializeJson(rstream); | 1250 | OSDMap mret = (OSDMap)OSDParser.DeserializeJson(rstream); |
1253 | 1251 | ||
@@ -1313,7 +1311,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
1313 | return false; | 1311 | return false; |
1314 | } | 1312 | } |
1315 | 1313 | ||
1316 | byte[] buf = new byte[8192]; | ||
1317 | Stream rstream = webResponse.GetResponseStream(); | 1314 | Stream rstream = webResponse.GetResponseStream(); |
1318 | 1315 | ||
1319 | OSDMap response = new OSDMap(); | 1316 | OSDMap response = new OSDMap(); |