diff options
author | Justin Clark-Casey (justincc) | 2011-11-14 18:16:14 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-14 18:16:14 +0000 |
commit | a64def8b73d4665b58852bbd75ba3ab010db7432 (patch) | |
tree | ac203391729952043ade88569fb54cd3b5fd5bda | |
parent | Add test for adding a friend whilst online (diff) | |
download | opensim-SC_OLD-a64def8b73d4665b58852bbd75ba3ab010db7432.zip opensim-SC_OLD-a64def8b73d4665b58852bbd75ba3ab010db7432.tar.gz opensim-SC_OLD-a64def8b73d4665b58852bbd75ba3ab010db7432.tar.bz2 opensim-SC_OLD-a64def8b73d4665b58852bbd75ba3ab010db7432.tar.xz |
minor: remove some mono compiler warnings
4 files changed, 2 insertions, 11 deletions
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 | |||
46 | // Fields | 46 | // Fields |
47 | private bool m_dumpAssetsToFile; | 47 | private bool m_dumpAssetsToFile; |
48 | private Scene m_Scene; | 48 | private Scene m_Scene; |
49 | private UUID UserID; | ||
50 | private Dictionary<UUID, AssetXferUploader> XferUploaders = new Dictionary<UUID, AssetXferUploader>(); | 49 | private Dictionary<UUID, AssetXferUploader> XferUploaders = new Dictionary<UUID, AssetXferUploader>(); |
51 | 50 | ||
52 | // Methods | 51 | // Methods |
@@ -54,7 +53,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
54 | bool dumpAssetsToFile) | 53 | bool dumpAssetsToFile) |
55 | { | 54 | { |
56 | m_Scene = scene; | 55 | m_Scene = scene; |
57 | UserID = agentID; | ||
58 | m_dumpAssetsToFile = dumpAssetsToFile; | 56 | m_dumpAssetsToFile = dumpAssetsToFile; |
59 | } | 57 | } |
60 | 58 | ||
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 | |||
354 | continue; | 354 | continue; |
355 | } | 355 | } |
356 | 356 | ||
357 | PresenceInfo presence = null; | ||
358 | PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid }); | ||
359 | if (presences != null && presences.Length > 0) | ||
360 | presence = presences[0]; | ||
361 | im.offline = 0; | 357 | im.offline = 0; |
362 | |||
363 | im.fromAgentID = fromAgentID.Guid; | 358 | im.fromAgentID = fromAgentID.Guid; |
364 | im.fromAgentName = firstname + " " + lastname; | 359 | im.fromAgentName = firstname + " " + lastname; |
365 | im.imSessionID = im.fromAgentID; | 360 | im.imSessionID = im.fromAgentID; |
366 | im.message = FriendshipMessage(fid); | 361 | im.message = FriendshipMessage(fid); |
367 | 362 | ||
368 | // Finally | ||
369 | LocalFriendshipOffered(agentID, im); | 363 | LocalFriendshipOffered(agentID, im); |
370 | } | 364 | } |
371 | 365 | ||
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 | |||
85 | UUID user2Id = TestHelpers.ParseTail(0x2); | 85 | UUID user2Id = TestHelpers.ParseTail(0x2); |
86 | 86 | ||
87 | ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId); | 87 | ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId); |
88 | ScenePresence sp2 = SceneHelpers.AddScenePresence(m_scene, user2Id); | 88 | SceneHelpers.AddScenePresence(m_scene, user2Id); |
89 | 89 | ||
90 | // This friendship is currently only one-way, which might be pathalogical in Second Life. | 90 | // This friendship is currently only one-way, which might be pathalogical in Second Life. |
91 | m_fm.AddFriend(sp.ControllingClient, user2Id); | 91 | 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 | |||
50 | /// </summary> | 50 | /// </summary> |
51 | public Scene Scene { get; set; } | 51 | public Scene Scene { get; set; } |
52 | 52 | ||
53 | private bool m_Enabled = false; | 53 | private bool m_Enabled; |
54 | private Scene m_Scene; | ||
55 | private XInventoryServicesConnector m_RemoteConnector; | 54 | private XInventoryServicesConnector m_RemoteConnector; |
56 | 55 | ||
57 | private IUserManagement m_UserManager; | 56 | private IUserManagement m_UserManager; |