minor: remove some mono compiler warnings in new groups code
parent
af9b17c545
commit
83da14008f
|
@ -485,7 +485,7 @@ namespace OpenSim.Groups
|
||||||
return;
|
return;
|
||||||
|
|
||||||
//// 16 bytes are the UUID. Maybe.
|
//// 16 bytes are the UUID. Maybe.
|
||||||
UUID folderID = new UUID(im.binaryBucket, 0);
|
// UUID folderID = new UUID(im.binaryBucket, 0);
|
||||||
UUID noticeID = new UUID(im.imSessionID);
|
UUID noticeID = new UUID(im.imSessionID);
|
||||||
|
|
||||||
GroupNoticeInfo notice = m_groupData.GetGroupNotice(remoteClient.AgentId.ToString(), noticeID);
|
GroupNoticeInfo notice = m_groupData.GetGroupNotice(remoteClient.AgentId.ToString(), noticeID);
|
||||||
|
|
|
@ -543,7 +543,6 @@ namespace OpenSim.Groups
|
||||||
List<string> urls = new List<string>();
|
List<string> urls = new List<string>();
|
||||||
foreach (GroupMembersData m in members)
|
foreach (GroupMembersData m in members)
|
||||||
{
|
{
|
||||||
UUID userID = UUID.Zero;
|
|
||||||
if (!m_UserManagement.IsLocalGridUser(m.AgentID))
|
if (!m_UserManagement.IsLocalGridUser(m.AgentID))
|
||||||
{
|
{
|
||||||
string gURL = m_UserManagement.GetUserServerURL(m.AgentID, "GroupsServerURI");
|
string gURL = m_UserManagement.GetUserServerURL(m.AgentID, "GroupsServerURI");
|
||||||
|
|
|
@ -47,7 +47,6 @@ namespace OpenSim.Groups
|
||||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
private HGGroupsService m_GroupsService;
|
private HGGroupsService m_GroupsService;
|
||||||
private string m_HomeURI = string.Empty;
|
|
||||||
private string m_ConfigName = "Groups";
|
private string m_ConfigName = "Groups";
|
||||||
|
|
||||||
// Called by Robust shell
|
// Called by Robust shell
|
||||||
|
@ -209,7 +208,6 @@ namespace OpenSim.Groups
|
||||||
UUID groupID = new UUID(request["GroupID"].ToString());
|
UUID groupID = new UUID(request["GroupID"].ToString());
|
||||||
string agentID = request["AgentID"].ToString();
|
string agentID = request["AgentID"].ToString();
|
||||||
string token = request["AccessToken"].ToString();
|
string token = request["AccessToken"].ToString();
|
||||||
string reason = string.Empty;
|
|
||||||
|
|
||||||
m_GroupsService.RemoveAgentFromGroup(agentID, agentID, groupID, token);
|
m_GroupsService.RemoveAgentFromGroup(agentID, agentID, groupID, token);
|
||||||
}
|
}
|
||||||
|
|
|
@ -269,7 +269,6 @@ namespace OpenSim.Groups
|
||||||
UUID groupID = new UUID(request["GroupID"].ToString());
|
UUID groupID = new UUID(request["GroupID"].ToString());
|
||||||
string agentID = request["AgentID"].ToString();
|
string agentID = request["AgentID"].ToString();
|
||||||
string requestingAgentID = request["RequestingAgentID"].ToString();
|
string requestingAgentID = request["RequestingAgentID"].ToString();
|
||||||
string reason = string.Empty;
|
|
||||||
|
|
||||||
m_GroupsService.RemoveAgentFromGroup(requestingAgentID, agentID, groupID);
|
m_GroupsService.RemoveAgentFromGroup(requestingAgentID, agentID, groupID);
|
||||||
}
|
}
|
||||||
|
@ -500,7 +499,6 @@ namespace OpenSim.Groups
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
string op = request["OP"].ToString();
|
string op = request["OP"].ToString();
|
||||||
string reason = string.Empty;
|
|
||||||
|
|
||||||
bool success = false;
|
bool success = false;
|
||||||
if (op == "ADD")
|
if (op == "ADD")
|
||||||
|
@ -568,7 +566,6 @@ namespace OpenSim.Groups
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
string op = request["OP"].ToString();
|
string op = request["OP"].ToString();
|
||||||
string reason = string.Empty;
|
|
||||||
|
|
||||||
if (op == "GROUP")
|
if (op == "GROUP")
|
||||||
{
|
{
|
||||||
|
@ -631,7 +628,6 @@ namespace OpenSim.Groups
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
string op = request["OP"].ToString();
|
string op = request["OP"].ToString();
|
||||||
string reason = string.Empty;
|
|
||||||
|
|
||||||
if (op == "ADD" && request.ContainsKey("GroupID") && request.ContainsKey("RoleID") && request.ContainsKey("AgentID"))
|
if (op == "ADD" && request.ContainsKey("GroupID") && request.ContainsKey("RoleID") && request.ContainsKey("AgentID"))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue