OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 5f58b9b552.
cpu-performance
Robert Adams 2013-07-09 18:24:39 -07:00
parent cec8e6d0f7
commit bb6fb65392
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
View File

@ -304,7 +304,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
} }
string serverURI = string.Empty; string serverURI = string.Empty;
// bool foreign = GetUserProfileServerURI(targetID, out serverURI); bool foreign = GetUserProfileServerURI(targetID, out serverURI);
UUID creatorId = UUID.Zero; UUID creatorId = UUID.Zero;
OSDMap parameters= new OSDMap(); OSDMap parameters= new OSDMap();
@ -369,7 +369,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
} }
string serverURI = string.Empty; string serverURI = string.Empty;
// bool foreign = GetUserProfileServerURI(target, out serverURI); bool foreign = GetUserProfileServerURI(target, out serverURI);
object Ad = (object)ad; object Ad = (object)ad;
if(!JsonRpcRequest(ref Ad, "classifieds_info_query", serverURI, UUID.Random().ToString())) if(!JsonRpcRequest(ref Ad, "classifieds_info_query", serverURI, UUID.Random().ToString()))
@ -438,9 +438,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
Vector3 pos = remoteClient.SceneAgent.AbsolutePosition; Vector3 pos = remoteClient.SceneAgent.AbsolutePosition;
ILandObject land = s.LandChannel.GetLandObject(pos.X, pos.Y); ILandObject land = s.LandChannel.GetLandObject(pos.X, pos.Y);
ScenePresence p = FindPresence(remoteClient.AgentId); ScenePresence p = FindPresence(remoteClient.AgentId);
Vector3 avaPos = p.AbsolutePosition;
string serverURI = string.Empty; string serverURI = string.Empty;
// bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
if (land == null) if (land == null)
{ {
@ -487,7 +488,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
public void ClassifiedDelete(UUID queryClassifiedID, IClientAPI remoteClient) public void ClassifiedDelete(UUID queryClassifiedID, IClientAPI remoteClient)
{ {
string serverURI = string.Empty; string serverURI = string.Empty;
// bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
UUID classifiedId; UUID classifiedId;
OSDMap parameters= new OSDMap(); OSDMap parameters= new OSDMap();
@ -537,7 +538,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
} }
string serverURI = string.Empty; string serverURI = string.Empty;
// bool foreign = GetUserProfileServerURI(targetId, out serverURI); bool foreign = GetUserProfileServerURI(targetId, out serverURI);
OSDMap parameters= new OSDMap(); OSDMap parameters= new OSDMap();
parameters.Add("creatorId", OSD.FromUUID(targetId)); parameters.Add("creatorId", OSD.FromUUID(targetId));
@ -588,7 +589,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
UUID targetID; UUID targetID;
UUID.TryParse(args[0], out targetID); UUID.TryParse(args[0], out targetID);
string serverURI = string.Empty; string serverURI = string.Empty;
// bool foreign = GetUserProfileServerURI(targetID, out serverURI); bool foreign = GetUserProfileServerURI(targetID, out serverURI);
IClientAPI remoteClient = (IClientAPI)sender; IClientAPI remoteClient = (IClientAPI)sender;
UserProfilePick pick = new UserProfilePick(); UserProfilePick pick = new UserProfilePick();
@ -656,7 +657,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
m_log.DebugFormat("[PROFILES]: Start PickInfoUpdate Name: {0} PickId: {1} SnapshotId: {2}", name, pickID.ToString(), snapshotID.ToString()); m_log.DebugFormat("[PROFILES]: Start PickInfoUpdate Name: {0} PickId: {1} SnapshotId: {2}", name, pickID.ToString(), snapshotID.ToString());
UserProfilePick pick = new UserProfilePick(); UserProfilePick pick = new UserProfilePick();
string serverURI = string.Empty; string serverURI = string.Empty;
// bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
ScenePresence p = FindPresence(remoteClient.AgentId); ScenePresence p = FindPresence(remoteClient.AgentId);
Vector3 avaPos = p.AbsolutePosition; Vector3 avaPos = p.AbsolutePosition;
@ -716,7 +717,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
public void PickDelete(IClientAPI remoteClient, UUID queryPickID) public void PickDelete(IClientAPI remoteClient, UUID queryPickID)
{ {
string serverURI = string.Empty; string serverURI = string.Empty;
// bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
OSDMap parameters= new OSDMap(); OSDMap parameters= new OSDMap();
parameters.Add("pickId", OSD.FromUUID(queryPickID)); parameters.Add("pickId", OSD.FromUUID(queryPickID));
@ -751,7 +752,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
IClientAPI remoteClient = (IClientAPI)sender; IClientAPI remoteClient = (IClientAPI)sender;
string serverURI = string.Empty; string serverURI = string.Empty;
// bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
note.TargetId = remoteClient.AgentId; note.TargetId = remoteClient.AgentId;
UUID.TryParse(args[0], out note.UserId); UUID.TryParse(args[0], out note.UserId);
@ -787,7 +788,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
note.Notes = queryNotes; note.Notes = queryNotes;
string serverURI = string.Empty; string serverURI = string.Empty;
// bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
object Note = note; object Note = note;
if(!JsonRpcRequest(ref Note, "avatar_notes_update", serverURI, UUID.Random().ToString())) if(!JsonRpcRequest(ref Note, "avatar_notes_update", serverURI, UUID.Random().ToString()))
@ -832,7 +833,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
prop.Language = languages; prop.Language = languages;
string serverURI = string.Empty; string serverURI = string.Empty;
// bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
object Param = prop; object Param = prop;
if(!JsonRpcRequest(ref Param, "avatar_interests_update", serverURI, UUID.Random().ToString())) if(!JsonRpcRequest(ref Param, "avatar_interests_update", serverURI, UUID.Random().ToString()))
@ -954,7 +955,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
prop.FirstLifeText = newProfile.FirstLifeAboutText; prop.FirstLifeText = newProfile.FirstLifeAboutText;
string serverURI = string.Empty; string serverURI = string.Empty;
// bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI); bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
object Prop = prop; object Prop = prop;
@ -993,7 +994,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
} }
string serverURI = string.Empty; string serverURI = string.Empty;
// bool foreign = GetUserProfileServerURI(properties.UserId, out serverURI); bool foreign = GetUserProfileServerURI(properties.UserId, out serverURI);
// This is checking a friend on the home grid // This is checking a friend on the home grid
// Not HG friend // Not HG friend
@ -1246,6 +1247,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
return false; return false;
} }
byte[] buf = new byte[8192];
Stream rstream = webResponse.GetResponseStream(); Stream rstream = webResponse.GetResponseStream();
OSDMap mret = (OSDMap)OSDParser.DeserializeJson(rstream); OSDMap mret = (OSDMap)OSDParser.DeserializeJson(rstream);
@ -1311,6 +1313,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
return false; return false;
} }
byte[] buf = new byte[8192];
Stream rstream = webResponse.GetResponseStream(); Stream rstream = webResponse.GetResponseStream();
OSDMap response = new OSDMap(); OSDMap response = new OSDMap();