From 85a9cb260a5f06df495e29dd8a3ae590970efe57 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Aug 2013 01:10:58 +0100
Subject: Remove mono compiler warnings from UserProfilesModule
---
.../Avatar/UserProfiles/UserProfileModule.cs | 35 ++++++++++------------
1 file changed, 16 insertions(+), 19 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index c04098c..966a05c 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -307,7 +307,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
}
string serverURI = string.Empty;
- bool foreign = GetUserProfileServerURI(targetID, out serverURI);
+ GetUserProfileServerURI(targetID, out serverURI);
UUID creatorId = UUID.Zero;
OSDMap parameters= new OSDMap();
@@ -372,7 +372,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
}
string serverURI = string.Empty;
- bool foreign = GetUserProfileServerURI(target, out serverURI);
+ GetUserProfileServerURI(target, out serverURI);
object Ad = (object)ad;
if(!JsonRpcRequest(ref Ad, "classifieds_info_query", serverURI, UUID.Random().ToString()))
@@ -441,10 +441,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
Vector3 pos = remoteClient.SceneAgent.AbsolutePosition;
ILandObject land = s.LandChannel.GetLandObject(pos.X, pos.Y);
ScenePresence p = FindPresence(remoteClient.AgentId);
- Vector3 avaPos = p.AbsolutePosition;
+// Vector3 avaPos = p.AbsolutePosition;
string serverURI = string.Empty;
- bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+ GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
if (land == null)
{
@@ -470,7 +470,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
object Ad = ad;
- OSD X = OSD.SerializeMembers(Ad);
+ OSD.SerializeMembers(Ad);
if(!JsonRpcRequest(ref Ad, "classified_update", serverURI, UUID.Random().ToString()))
{
@@ -491,7 +491,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
public void ClassifiedDelete(UUID queryClassifiedID, IClientAPI remoteClient)
{
string serverURI = string.Empty;
- bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+ GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
UUID classifiedId;
OSDMap parameters= new OSDMap();
@@ -541,7 +541,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
}
string serverURI = string.Empty;
- bool foreign = GetUserProfileServerURI(targetId, out serverURI);
+ GetUserProfileServerURI(targetId, out serverURI);
OSDMap parameters= new OSDMap();
parameters.Add("creatorId", OSD.FromUUID(targetId));
@@ -592,7 +592,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
UUID targetID;
UUID.TryParse(args[0], out targetID);
string serverURI = string.Empty;
- bool foreign = GetUserProfileServerURI(targetID, out serverURI);
+ GetUserProfileServerURI(targetID, out serverURI);
IClientAPI remoteClient = (IClientAPI)sender;
UserProfilePick pick = new UserProfilePick();
@@ -660,7 +660,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
m_log.DebugFormat("[PROFILES]: Start PickInfoUpdate Name: {0} PickId: {1} SnapshotId: {2}", name, pickID.ToString(), snapshotID.ToString());
UserProfilePick pick = new UserProfilePick();
string serverURI = string.Empty;
- bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+ GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
ScenePresence p = FindPresence(remoteClient.AgentId);
Vector3 avaPos = p.AbsolutePosition;
@@ -720,7 +720,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
public void PickDelete(IClientAPI remoteClient, UUID queryPickID)
{
string serverURI = string.Empty;
- bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+ GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
OSDMap parameters= new OSDMap();
parameters.Add("pickId", OSD.FromUUID(queryPickID));
@@ -755,7 +755,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
IClientAPI remoteClient = (IClientAPI)sender;
string serverURI = string.Empty;
- bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+ GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
note.TargetId = remoteClient.AgentId;
UUID.TryParse(args[0], out note.UserId);
@@ -791,7 +791,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
note.Notes = queryNotes;
string serverURI = string.Empty;
- bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+ GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
object Note = note;
if(!JsonRpcRequest(ref Note, "avatar_notes_update", serverURI, UUID.Random().ToString()))
@@ -836,7 +836,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
prop.Language = languages;
string serverURI = string.Empty;
- bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+ GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
object Param = prop;
if(!JsonRpcRequest(ref Param, "avatar_interests_update", serverURI, UUID.Random().ToString()))
@@ -958,7 +958,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
prop.FirstLifeText = newProfile.FirstLifeAboutText;
string serverURI = string.Empty;
- bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+ GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
object Prop = prop;
@@ -972,7 +972,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
}
}
-
/// <summary>
/// Gets the profile data.
/// </summary>
@@ -997,7 +996,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
}
string serverURI = string.Empty;
- bool foreign = GetUserProfileServerURI(properties.UserId, out serverURI);
+ GetUserProfileServerURI(properties.UserId, out serverURI);
// This is checking a friend on the home grid
// Not HG friend
@@ -1245,11 +1244,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
return false;
}
- byte[] buf = new byte[8192];
Stream rstream = webResponse.GetResponseStream();
OSDMap mret = (OSDMap)OSDParser.DeserializeJson(rstream);
- if(mret.ContainsKey("error"))
+ if (mret.ContainsKey("error"))
return false;
// get params...
@@ -1311,7 +1309,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
return false;
}
- byte[] buf = new byte[8192];
Stream rstream = webResponse.GetResponseStream();
OSDMap response = new OSDMap();
--
cgit v1.1