mirror of
https://github.com/opensim/opensim.git
synced 2026-05-13 01:46:07 +08:00
cosmetics
This commit is contained in:
@@ -95,7 +95,7 @@ namespace OpenSim.Groups
|
||||
|
||||
public ExtendedGroupRecord GetGroupRecord(string RequestingAgentID, UUID GroupID, string GroupName, string token)
|
||||
{
|
||||
if (GroupID.IsZero() && (GroupName == null || (GroupName != null && GroupName == string.Empty)))
|
||||
if (GroupID.IsZero() && string.IsNullOrEmpty(GroupName))
|
||||
return null;
|
||||
|
||||
Dictionary<string, object> sendData = new Dictionary<string, object>();
|
||||
|
||||
@@ -134,7 +134,7 @@ namespace OpenSim.Groups
|
||||
|
||||
public ExtendedGroupRecord GetGroupRecord(string RequestingAgentID, UUID GroupID, string GroupName)
|
||||
{
|
||||
if (GroupID.IsZero() && (GroupName == null || (GroupName != null && GroupName == string.Empty)))
|
||||
if (GroupID.IsZero() && string.IsNullOrEmpty(GroupName))
|
||||
return null;
|
||||
|
||||
Dictionary<string, object> sendData = new Dictionary<string, object>();
|
||||
|
||||
@@ -183,7 +183,7 @@ namespace OpenSim.Groups
|
||||
|
||||
public ExtendedGroupRecord GetGroupRecord(string RequestingAgentID, UUID GroupID, string GroupName)
|
||||
{
|
||||
if (GroupID.IsZero() && (GroupName == null || GroupName != null && GroupName == string.Empty))
|
||||
if (GroupID.IsZero() && string.IsNullOrEmpty(GroupName))
|
||||
return null;
|
||||
|
||||
return m_CacheWrapper.GetGroupRecord(RequestingAgentID,GroupID,GroupName, delegate
|
||||
|
||||
@@ -109,7 +109,7 @@ namespace OpenSim.Groups
|
||||
|
||||
public ExtendedGroupRecord GetGroupRecord(string RequestingAgentID, UUID GroupID, string GroupName, GroupRecordDelegate d)
|
||||
{
|
||||
//if (GroupID.IsZero() && (GroupName == null || GroupName != null && GroupName == string.Empty))
|
||||
//if (GroupID.IsZero() && string.IsNullOrEmpty(GroupName))
|
||||
// return null;
|
||||
|
||||
object group = null;
|
||||
|
||||
@@ -134,7 +134,7 @@ namespace OpenSim.Framework
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((value == null) || (value != null && value == string.Empty))
|
||||
if (string.IsNullOrEmpty(value))
|
||||
{
|
||||
m_creatorData = string.Empty;
|
||||
return;
|
||||
|
||||
@@ -358,7 +358,7 @@ namespace OSHttpServer.Parser
|
||||
{
|
||||
if (ch == '\r' || ch == '\n')
|
||||
{
|
||||
if (m_curHeaderName == string.Empty)
|
||||
if (m_curHeaderName.Length == 0)
|
||||
throw new BadRequestException("Missing header on line " + currentLine);
|
||||
|
||||
if (currentPos - startPos > 8190)
|
||||
|
||||
@@ -132,7 +132,7 @@ namespace OpenSim.Framework
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((value == null) || (value != null && value == string.Empty))
|
||||
if (string.IsNullOrEmpty(value))
|
||||
{
|
||||
_creatorData = string.Empty;
|
||||
return;
|
||||
|
||||
@@ -267,7 +267,7 @@ namespace OpenSim.Services.Connectors
|
||||
uri,
|
||||
reqString,
|
||||
m_Auth);
|
||||
if (reply == null || (reply != null && reply == string.Empty))
|
||||
if (string.IsNullOrEmpty(reply))
|
||||
{
|
||||
m_log.DebugFormat("[PRESENCE CONNECTOR]: GetAgent received null or empty reply");
|
||||
return null;
|
||||
@@ -324,7 +324,7 @@ namespace OpenSim.Services.Connectors
|
||||
uri,
|
||||
reqString,
|
||||
m_Auth);
|
||||
if (reply == null || (reply != null && reply == string.Empty))
|
||||
if (string.IsNullOrEmpty(reply))
|
||||
{
|
||||
m_log.DebugFormat("[PRESENCE CONNECTOR]: GetAgents received null or empty reply");
|
||||
return null;
|
||||
|
||||
@@ -156,7 +156,7 @@ namespace OpenSim.Services.Connectors
|
||||
uri,
|
||||
reqString,
|
||||
m_Auth);
|
||||
if (reply == null || (reply != null && reply == string.Empty))
|
||||
if (string.IsNullOrEmpty(reply))
|
||||
{
|
||||
m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccounts received null or empty reply");
|
||||
return null;
|
||||
@@ -240,7 +240,7 @@ namespace OpenSim.Services.Connectors
|
||||
uri,
|
||||
reqString,
|
||||
m_Auth);
|
||||
if (reply == null || (reply != null && reply == string.Empty))
|
||||
if (string.IsNullOrEmpty(reply))
|
||||
{
|
||||
m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetMultiUserAccounts received null or empty reply");
|
||||
return null;
|
||||
@@ -364,7 +364,7 @@ namespace OpenSim.Services.Connectors
|
||||
uri,
|
||||
reqString,
|
||||
m_Auth);
|
||||
if (reply == null || (reply != null && reply == string.Empty))
|
||||
if (string.IsNullOrEmpty(reply))
|
||||
{
|
||||
m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccount received null or empty reply");
|
||||
return null;
|
||||
|
||||
@@ -266,7 +266,7 @@ namespace OpenSim.Services.LLLoginService
|
||||
//
|
||||
string token = m_AuthenticationService.Authenticate(account.PrincipalID, passwd, 30);
|
||||
UUID secureSession = UUID.Zero;
|
||||
if ((token == string.Empty) || (token != string.Empty && !UUID.TryParse(token, out secureSession)))
|
||||
if ((token == string.Empty) || (!UUID.TryParse(token, out secureSession)))
|
||||
{
|
||||
m_log.InfoFormat("[LLOGIN SERVICE]: SetLevel failed, reason: authentication failed");
|
||||
return response;
|
||||
|
||||
Reference in New Issue
Block a user