aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorRobert Adams2013-07-09 18:24:39 -0700
committerRobert Adams2013-07-09 18:24:39 -0700
commitbb6fb65392dfa2249eeade137ea3316b3b3364c9 (patch)
tree00b9224703cc6e7c0d9b43b08413341ba754db87 /OpenSim/Region
parentIf a sensor is in an attachment, avoid throwing an exception if the attachee ... (diff)
downloadopensim-SC-bb6fb65392dfa2249eeade137ea3316b3b3364c9.zip
opensim-SC-bb6fb65392dfa2249eeade137ea3316b3b3364c9.tar.gz
opensim-SC-bb6fb65392dfa2249eeade137ea3316b3b3364c9.tar.bz2
opensim-SC-bb6fb65392dfa2249eeade137ea3316b3b3364c9.tar.xz
Revert "minor: remove some mono compiler warnings in UserProfileModule"
Revert until we understand why all the calls to GetUserProfileServerURI were also commented out. This reverts commit 5f58b9b5526c401e039d27b8c92603ff02421fb8.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs29
1 files changed, 16 insertions, 13 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 44edd7f..161f160 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,9 +438,10 @@ 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;
441 442
442 string serverURI = string.Empty; 443 string serverURI = string.Empty;
443// bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); 444 bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
444 445
445 if (land == null) 446 if (land == null)
446 { 447 {
@@ -487,7 +488,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
487 public void ClassifiedDelete(UUID queryClassifiedID, IClientAPI remoteClient) 488 public void ClassifiedDelete(UUID queryClassifiedID, IClientAPI remoteClient)
488 { 489 {
489 string serverURI = string.Empty; 490 string serverURI = string.Empty;
490// bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); 491 bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
491 492
492 UUID classifiedId; 493 UUID classifiedId;
493 OSDMap parameters= new OSDMap(); 494 OSDMap parameters= new OSDMap();
@@ -537,7 +538,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
537 } 538 }
538 539
539 string serverURI = string.Empty; 540 string serverURI = string.Empty;
540// bool foreign = GetUserProfileServerURI(targetId, out serverURI); 541 bool foreign = GetUserProfileServerURI(targetId, out serverURI);
541 542
542 OSDMap parameters= new OSDMap(); 543 OSDMap parameters= new OSDMap();
543 parameters.Add("creatorId", OSD.FromUUID(targetId)); 544 parameters.Add("creatorId", OSD.FromUUID(targetId));
@@ -588,7 +589,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
588 UUID targetID; 589 UUID targetID;
589 UUID.TryParse(args[0], out targetID); 590 UUID.TryParse(args[0], out targetID);
590 string serverURI = string.Empty; 591 string serverURI = string.Empty;
591// bool foreign = GetUserProfileServerURI(targetID, out serverURI); 592 bool foreign = GetUserProfileServerURI(targetID, out serverURI);
592 IClientAPI remoteClient = (IClientAPI)sender; 593 IClientAPI remoteClient = (IClientAPI)sender;
593 594
594 UserProfilePick pick = new UserProfilePick(); 595 UserProfilePick pick = new UserProfilePick();
@@ -656,7 +657,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
656 m_log.DebugFormat("[PROFILES]: Start PickInfoUpdate Name: {0} PickId: {1} SnapshotId: {2}", name, pickID.ToString(), snapshotID.ToString()); 657 m_log.DebugFormat("[PROFILES]: Start PickInfoUpdate Name: {0} PickId: {1} SnapshotId: {2}", name, pickID.ToString(), snapshotID.ToString());
657 UserProfilePick pick = new UserProfilePick(); 658 UserProfilePick pick = new UserProfilePick();
658 string serverURI = string.Empty; 659 string serverURI = string.Empty;
659// bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); 660 bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
660 ScenePresence p = FindPresence(remoteClient.AgentId); 661 ScenePresence p = FindPresence(remoteClient.AgentId);
661 662
662 Vector3 avaPos = p.AbsolutePosition; 663 Vector3 avaPos = p.AbsolutePosition;
@@ -716,7 +717,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
716 public void PickDelete(IClientAPI remoteClient, UUID queryPickID) 717 public void PickDelete(IClientAPI remoteClient, UUID queryPickID)
717 { 718 {
718 string serverURI = string.Empty; 719 string serverURI = string.Empty;
719// bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); 720 bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
720 721
721 OSDMap parameters= new OSDMap(); 722 OSDMap parameters= new OSDMap();
722 parameters.Add("pickId", OSD.FromUUID(queryPickID)); 723 parameters.Add("pickId", OSD.FromUUID(queryPickID));
@@ -751,7 +752,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
751 752
752 IClientAPI remoteClient = (IClientAPI)sender; 753 IClientAPI remoteClient = (IClientAPI)sender;
753 string serverURI = string.Empty; 754 string serverURI = string.Empty;
754// bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); 755 bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
755 note.TargetId = remoteClient.AgentId; 756 note.TargetId = remoteClient.AgentId;
756 UUID.TryParse(args[0], out note.UserId); 757 UUID.TryParse(args[0], out note.UserId);
757 758
@@ -787,7 +788,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
787 note.Notes = queryNotes; 788 note.Notes = queryNotes;
788 789
789 string serverURI = string.Empty; 790 string serverURI = string.Empty;
790// bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); 791 bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
791 792
792 object Note = note; 793 object Note = note;
793 if(!JsonRpcRequest(ref Note, "avatar_notes_update", serverURI, UUID.Random().ToString())) 794 if(!JsonRpcRequest(ref Note, "avatar_notes_update", serverURI, UUID.Random().ToString()))
@@ -832,7 +833,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
832 prop.Language = languages; 833 prop.Language = languages;
833 834
834 string serverURI = string.Empty; 835 string serverURI = string.Empty;
835// bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); 836 bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
836 837
837 object Param = prop; 838 object Param = prop;
838 if(!JsonRpcRequest(ref Param, "avatar_interests_update", serverURI, UUID.Random().ToString())) 839 if(!JsonRpcRequest(ref Param, "avatar_interests_update", serverURI, UUID.Random().ToString()))
@@ -954,7 +955,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
954 prop.FirstLifeText = newProfile.FirstLifeAboutText; 955 prop.FirstLifeText = newProfile.FirstLifeAboutText;
955 956
956 string serverURI = string.Empty; 957 string serverURI = string.Empty;
957// bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); 958 bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
958 959
959 object Prop = prop; 960 object Prop = prop;
960 961
@@ -993,7 +994,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
993 } 994 }
994 995
995 string serverURI = string.Empty; 996 string serverURI = string.Empty;
996// bool foreign = GetUserProfileServerURI(properties.UserId, out serverURI); 997 bool foreign = GetUserProfileServerURI(properties.UserId, out serverURI);
997 998
998 // This is checking a friend on the home grid 999 // This is checking a friend on the home grid
999 // Not HG friend 1000 // Not HG friend
@@ -1246,6 +1247,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
1246 return false; 1247 return false;
1247 } 1248 }
1248 1249
1250 byte[] buf = new byte[8192];
1249 Stream rstream = webResponse.GetResponseStream(); 1251 Stream rstream = webResponse.GetResponseStream();
1250 OSDMap mret = (OSDMap)OSDParser.DeserializeJson(rstream); 1252 OSDMap mret = (OSDMap)OSDParser.DeserializeJson(rstream);
1251 1253
@@ -1311,6 +1313,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
1311 return false; 1313 return false;
1312 } 1314 }
1313 1315
1316 byte[] buf = new byte[8192];
1314 Stream rstream = webResponse.GetResponseStream(); 1317 Stream rstream = webResponse.GetResponseStream();
1315 1318
1316 OSDMap response = new OSDMap(); 1319 OSDMap response = new OSDMap();