diff options
author | Justin Clark-Casey (justincc) | 2013-07-08 23:57:05 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-07-08 23:57:05 +0100 |
commit | 83da14008f9a8a4ad0cf0dd5487327e4a319fd5d (patch) | |
tree | f06fb594a1ffec2e32989908dd89d4873e019268 | |
parent | minor: remove mono compiler warnings related to keyframe code (diff) | |
download | opensim-SC_OLD-83da14008f9a8a4ad0cf0dd5487327e4a319fd5d.zip opensim-SC_OLD-83da14008f9a8a4ad0cf0dd5487327e4a319fd5d.tar.gz opensim-SC_OLD-83da14008f9a8a4ad0cf0dd5487327e4a319fd5d.tar.bz2 opensim-SC_OLD-83da14008f9a8a4ad0cf0dd5487327e4a319fd5d.tar.xz |
minor: remove some mono compiler warnings in new groups code
4 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs index 5959bac..82e2d6f 100644 --- a/OpenSim/Addons/Groups/GroupsModule.cs +++ b/OpenSim/Addons/Groups/GroupsModule.cs | |||
@@ -485,7 +485,7 @@ namespace OpenSim.Groups | |||
485 | return; | 485 | return; |
486 | 486 | ||
487 | //// 16 bytes are the UUID. Maybe. | 487 | //// 16 bytes are the UUID. Maybe. |
488 | UUID folderID = new UUID(im.binaryBucket, 0); | 488 | // UUID folderID = new UUID(im.binaryBucket, 0); |
489 | UUID noticeID = new UUID(im.imSessionID); | 489 | UUID noticeID = new UUID(im.imSessionID); |
490 | 490 | ||
491 | GroupNoticeInfo notice = m_groupData.GetGroupNotice(remoteClient.AgentId.ToString(), noticeID); | 491 | GroupNoticeInfo notice = m_groupData.GetGroupNotice(remoteClient.AgentId.ToString(), noticeID); |
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs index cff7adf..c3c759e 100644 --- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs +++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | |||
@@ -543,7 +543,6 @@ namespace OpenSim.Groups | |||
543 | List<string> urls = new List<string>(); | 543 | List<string> urls = new List<string>(); |
544 | foreach (GroupMembersData m in members) | 544 | foreach (GroupMembersData m in members) |
545 | { | 545 | { |
546 | UUID userID = UUID.Zero; | ||
547 | if (!m_UserManagement.IsLocalGridUser(m.AgentID)) | 546 | if (!m_UserManagement.IsLocalGridUser(m.AgentID)) |
548 | { | 547 | { |
549 | string gURL = m_UserManagement.GetUserServerURL(m.AgentID, "GroupsServerURI"); | 548 | string gURL = m_UserManagement.GetUserServerURL(m.AgentID, "GroupsServerURI"); |
diff --git a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs index 67750f5..d2bcba5 100644 --- a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs | |||
@@ -47,7 +47,6 @@ namespace OpenSim.Groups | |||
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | private HGGroupsService m_GroupsService; | 49 | private HGGroupsService m_GroupsService; |
50 | private string m_HomeURI = string.Empty; | ||
51 | private string m_ConfigName = "Groups"; | 50 | private string m_ConfigName = "Groups"; |
52 | 51 | ||
53 | // Called by Robust shell | 52 | // Called by Robust shell |
@@ -209,7 +208,6 @@ namespace OpenSim.Groups | |||
209 | UUID groupID = new UUID(request["GroupID"].ToString()); | 208 | UUID groupID = new UUID(request["GroupID"].ToString()); |
210 | string agentID = request["AgentID"].ToString(); | 209 | string agentID = request["AgentID"].ToString(); |
211 | string token = request["AccessToken"].ToString(); | 210 | string token = request["AccessToken"].ToString(); |
212 | string reason = string.Empty; | ||
213 | 211 | ||
214 | m_GroupsService.RemoveAgentFromGroup(agentID, agentID, groupID, token); | 212 | m_GroupsService.RemoveAgentFromGroup(agentID, agentID, groupID, token); |
215 | } | 213 | } |
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs index 515b818..106c6c4 100644 --- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs | |||
@@ -269,7 +269,6 @@ namespace OpenSim.Groups | |||
269 | UUID groupID = new UUID(request["GroupID"].ToString()); | 269 | UUID groupID = new UUID(request["GroupID"].ToString()); |
270 | string agentID = request["AgentID"].ToString(); | 270 | string agentID = request["AgentID"].ToString(); |
271 | string requestingAgentID = request["RequestingAgentID"].ToString(); | 271 | string requestingAgentID = request["RequestingAgentID"].ToString(); |
272 | string reason = string.Empty; | ||
273 | 272 | ||
274 | m_GroupsService.RemoveAgentFromGroup(requestingAgentID, agentID, groupID); | 273 | m_GroupsService.RemoveAgentFromGroup(requestingAgentID, agentID, groupID); |
275 | } | 274 | } |
@@ -500,7 +499,6 @@ namespace OpenSim.Groups | |||
500 | else | 499 | else |
501 | { | 500 | { |
502 | string op = request["OP"].ToString(); | 501 | string op = request["OP"].ToString(); |
503 | string reason = string.Empty; | ||
504 | 502 | ||
505 | bool success = false; | 503 | bool success = false; |
506 | if (op == "ADD") | 504 | if (op == "ADD") |
@@ -568,7 +566,6 @@ namespace OpenSim.Groups | |||
568 | else | 566 | else |
569 | { | 567 | { |
570 | string op = request["OP"].ToString(); | 568 | string op = request["OP"].ToString(); |
571 | string reason = string.Empty; | ||
572 | 569 | ||
573 | if (op == "GROUP") | 570 | if (op == "GROUP") |
574 | { | 571 | { |
@@ -631,7 +628,6 @@ namespace OpenSim.Groups | |||
631 | else | 628 | else |
632 | { | 629 | { |
633 | string op = request["OP"].ToString(); | 630 | string op = request["OP"].ToString(); |
634 | string reason = string.Empty; | ||
635 | 631 | ||
636 | if (op == "ADD" && request.ContainsKey("GroupID") && request.ContainsKey("RoleID") && request.ContainsKey("AgentID")) | 632 | if (op == "ADD" && request.ContainsKey("GroupID") && request.ContainsKey("RoleID") && request.ContainsKey("AgentID")) |
637 | { | 633 | { |