From a64def8b73d4665b58852bbd75ba3ab010db7432 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 14 Nov 2011 18:16:14 +0000
Subject: minor: remove some mono compiler warnings

---
 .../CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs   | 2 --
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs          | 6 ------
 .../Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs    | 2 +-
 .../Inventory/RemoteXInventoryServiceConnector.cs                   | 3 +--
 4 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index eed7cd5..b557ffe 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -46,7 +46,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         // Fields
         private bool m_dumpAssetsToFile;
         private Scene m_Scene;
-        private UUID UserID;
         private Dictionary<UUID, AssetXferUploader> XferUploaders = new Dictionary<UUID, AssetXferUploader>();
 
         // Methods
@@ -54,7 +53,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
                 bool dumpAssetsToFile)
         {
             m_Scene = scene;
-            UserID = agentID;
             m_dumpAssetsToFile = dumpAssetsToFile;
         }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index f4281e5..31ffc4d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -354,18 +354,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     continue;
                 }
 
-                PresenceInfo presence = null;
-                PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid });
-                if (presences != null && presences.Length > 0)
-                    presence = presences[0];
                 im.offline = 0;
-
                 im.fromAgentID = fromAgentID.Guid;
                 im.fromAgentName = firstname + " " + lastname;
                 im.imSessionID = im.fromAgentID;
                 im.message = FriendshipMessage(fid);
 
-                // Finally
                 LocalFriendshipOffered(agentID, im);
             }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
index 3ad691a..942091c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends.Tests
             UUID user2Id = TestHelpers.ParseTail(0x2);
 
             ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
-            ScenePresence sp2 = SceneHelpers.AddScenePresence(m_scene, user2Id);
+            SceneHelpers.AddScenePresence(m_scene, user2Id);
 
             // This friendship is currently only one-way, which might be pathalogical in Second Life.
             m_fm.AddFriend(sp.ControllingClient, user2Id);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index 73ab4e3..10ab6d0 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -50,8 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         /// </summary>
         public Scene Scene { get; set; }
 
-        private bool m_Enabled = false;
-        private Scene m_Scene;
+        private bool m_Enabled;
         private XInventoryServicesConnector m_RemoteConnector;
 
         private IUserManagement m_UserManager;
-- 
cgit v1.1