ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

very useless changes

Browse Source
This commit is contained in:
UbitUmarov
2025-06-25 02:22:28 +01:00
parent f1d84b7866
commit 0d71b6d871
78 changed files with 123 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Services/Base/ServiceBase.cs
View File

@@ -56,7 +56,7 @@ namespace OpenSim.Services.Base
dllName = pathRoot + parts[0];
string className = String.Empty;
string className = string.Empty;
if (parts.Length > 1)
className = parts[1];

12
OpenSim/Services/Connectors/Estate/EstateDataConnector.cs
View File

@@ -45,7 +45,7 @@ namespace OpenSim.Services.Connectors
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private string m_ServerURI = String.Empty;
private string m_ServerURI = string.Empty;
private ExpiringCache<string, List<EstateSettings>> m_EstateCache = new ExpiringCache<string, List<EstateSettings>>();
private const int EXPIRATION = 5 * 60; // 5 minutes in secs
@@ -80,7 +80,7 @@ namespace OpenSim.Services.Connectors
{
string uri = m_ServerURI + "/estates";
string reply = MakeRequest("GET", uri, string.Empty);
if (String.IsNullOrEmpty(reply))
if (string.IsNullOrEmpty(reply))
return [];
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -153,7 +153,7 @@ namespace OpenSim.Services.Connectors
string uri = m_ServerURI + "/estates/regions/?eid=" + estateID.ToString();
string reply = MakeRequest("GET", uri, string.Empty);
if (String.IsNullOrEmpty(reply))
if (string.IsNullOrEmpty(reply))
return [];
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -179,7 +179,7 @@ namespace OpenSim.Services.Connectors
// /estates/estate/?region=uuid&create=[t|f]
string uri = m_ServerURI + $"/estates/estate/?region={regionID}&create={create}";
string reply = MakeRequest("GET", uri, string.Empty);
if (String.IsNullOrEmpty(reply))
if (string.IsNullOrEmpty(reply))
return null;
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -202,7 +202,7 @@ namespace OpenSim.Services.Connectors
string uri = m_ServerURI + $"/estates/estate/?eid={estateID}";
string reply = MakeRequest("GET", uri, string.Empty);
if (String.IsNullOrEmpty(reply))
if (string.IsNullOrEmpty(reply))
return null;
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -257,7 +257,7 @@ namespace OpenSim.Services.Connectors
string reqString = ServerUtils.BuildQueryString(sendData);
string reply = MakeRequest("POST", uri, reqString);
if (String.IsNullOrEmpty(reply))
if (string.IsNullOrEmpty(reply))
return false;
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);

4
OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
View File

@@ -42,7 +42,7 @@ namespace OpenSim.Services.Connectors
public class GridServicesConnector : BaseServiceConnector, IGridService
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private string m_ServerURI = String.Empty;
private string m_ServerURI = string.Empty;
private string m_ServerGridURI = string.Empty;
public GridServicesConnector()
@@ -788,7 +788,7 @@ namespace OpenSim.Services.Connectors
return [];
}
#endregion
#endregion
}
}

2
OpenSim/Services/HypergridService/GatekeeperService.cs
View File

@@ -365,7 +365,7 @@ namespace OpenSim.Services.HypergridService
}
}
if (!String.IsNullOrWhiteSpace(m_DeniedMacs))
if (!string.IsNullOrWhiteSpace(m_DeniedMacs))
{
//m_log.InfoFormat("[GATEKEEPER SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs);
if (m_DeniedMacs.Contains(curMac, StringComparison.InvariantCultureIgnoreCase))

8
OpenSim/Services/HypergridService/UserAgentServiceBase.cs
View File

@@ -39,8 +39,8 @@ namespace OpenSim.Services.HypergridService
public UserAgentServiceBase(IConfigSource config)
: base(config)
{
string dllName = String.Empty;
string connString = String.Empty;
string dllName = string.Empty;
string connString = string.Empty;
string realm = "hg_traveling_data";
//
@@ -50,9 +50,9 @@ namespace OpenSim.Services.HypergridService
if (dbConfig is not null)
{
if (dllName.Length == 0)
dllName = dbConfig.GetString("StorageProvider", String.Empty);
dllName = dbConfig.GetString("StorageProvider", string.Empty);
if (connString.Length == 0)
connString = dbConfig.GetString("ConnectionString", String.Empty);
connString = dbConfig.GetString("ConnectionString", string.Empty);
}
//

8
OpenSim/Services/InventoryService/XInventoryService.cs
View File

@@ -56,8 +56,8 @@ namespace OpenSim.Services.InventoryService
if (configName != string.Empty)
m_ConfigName = configName;
string dllName = String.Empty;
string connString = String.Empty;
string dllName = string.Empty;
string connString = string.Empty;
//string realm = "Inventory"; // OSG version doesn't use this
//
@@ -79,9 +79,9 @@ namespace OpenSim.Services.InventoryService
if (dbConfig != null)
{
if (dllName.Length == 0)
dllName = dbConfig.GetString("StorageProvider", String.Empty);
dllName = dbConfig.GetString("StorageProvider", string.Empty);
if (connString.Length == 0)
connString = dbConfig.GetString("ConnectionString", String.Empty);
connString = dbConfig.GetString("ConnectionString", string.Empty);
}
//

1
OpenSim/Services/LLLoginService/LLLoginResponse.cs
View File

@@ -382,7 +382,6 @@ namespace OpenSim.Services.LLLoginService
y,
pinfo.HomePosition.X, pinfo.HomePosition.Y, pinfo.HomePosition.Z,
pinfo.HomeLookAt.X, pinfo.HomeLookAt.Y, pinfo.HomeLookAt.Z);
}
private void FillOutRegionData(GridRegion destination)

4
OpenSim/Services/MapImageService/MapImageService.cs
View File

@@ -118,7 +118,7 @@ namespace OpenSim.Services.MapImageService
public bool RemoveMapTile(int x, int y, UUID scopeID, out string reason)
{
reason = String.Empty;
reason = string.Empty;
string fileName = GetFileName(1, x, y, scopeID);
lock (m_Sync)
@@ -212,13 +212,13 @@ namespace OpenSim.Services.MapImageService
return File.ReadAllBytes(fullName);
}
}
catch
{
format = ".jpg";
return m_WaterJPEGBytes is null ? Array.Empty<byte>() : m_WaterJPEGBytes;
}
}
#endregion
private string GetFileName(int zoomLevel, int x, int y, UUID scopeID)

2
OpenSim/Services/UserAccountService/UserAccountService.cs
View File

@@ -280,7 +280,7 @@ namespace OpenSim.Services.UserAccountService
public List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs)
{
UserAccountData[] ret = m_Database.GetUsersWhere(scopeID, "PrincipalID in ('" + String.Join("', '", IDs) + "')");
UserAccountData[] ret = m_Database.GetUsersWhere(scopeID, "PrincipalID in ('" + string.Join("', '", IDs) + "')");
if(ret == null || ret.Length == 0)
return [];

2
OpenSim/Services/UserProfilesService/UserProfilesService.cs
View File

@@ -69,7 +69,6 @@ namespace OpenSim.Services.ProfilesService
public OSD AvatarClassifiedsRequest(UUID creatorId)
{
OSDArray records = ProfilesData.GetClassifiedRecords(creatorId);
return records;
}
@@ -104,7 +103,6 @@ namespace OpenSim.Services.ProfilesService
public OSD AvatarPicksRequest(UUID creatorId)
{
OSDArray records = ProfilesData.GetAvatarPicks(creatorId);
return records;
}