ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

minor cleanup

Browse Source
This commit is contained in:
UbitUmarov
2022-09-20 21:32:10 +01:00
parent 086fcc7ff7
commit 31fa8b45df
7 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs
View File

@@ -72,7 +72,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
{
while (tries > 0)
{
RegionInfo[] regionInfos = new RegionInfo[] { };
RegionInfo[] regionInfos = Array.Empty<RegionInfo>();
int regionCount = 0;
HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(url);
webRequest.Timeout = 30000; //30 Second Timeout
@@ -118,10 +118,10 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
if (((HttpWebResponse)ex.Response).StatusCode == HttpStatusCode.NotFound)
{
if (!allowRegionless)
throw ex;
throw;
}
else
throw ex;
throw;
}
if (regionCount > 0 || allowRegionless)

32
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@@ -1216,11 +1216,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
m_log.InfoFormat("[RADMIN]: CreateUser: User {0} {1} created, UUID {2}", firstName, lastName, account.PrincipalID);
}
catch (Exception e)
catch
{
responseData["avatar_uuid"] = UUID.Zero.ToString();
throw e;
throw;
}
m_log.Info("[RADMIN]: CreateUser: request complete");
@@ -1446,11 +1445,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
firstName, lastName,
account.PrincipalID);
}
catch (Exception e)
catch
{
responseData["avatar_uuid"] = UUID.Zero.ToString();
throw e;
throw;
}
m_log.Info("[RADMIN]: UpdateUserAccount: request complete");
@@ -1583,7 +1581,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
{
responseData["success"] = false;
responseData["error"] = e.Message;
throw e;
throw;
}
m_log.Info("[RADMIN]: AuthenticateUser: request complete");
@@ -1668,11 +1666,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
responseData["loaded"] = true;
}
catch (Exception e)
catch
{
responseData["loaded"] = false;
throw e;
throw;
}
m_log.Info("[RADMIN]: Load OAR Administrator Request complete");
@@ -1792,11 +1789,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
responseData["saved"] = true;
}
catch (Exception e)
catch
{
responseData["saved"] = false;
throw e;
throw;
}
m_log.Info("[RADMIN]: Save OAR Request complete");
@@ -1856,12 +1852,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
responseData["loaded"] = true;
}
catch (Exception e)
catch
{
responseData["loaded"] = false;
responseData["switched"] = false;
throw e;
throw;
}
m_log.Info("[RADMIN]: Load XML Administrator Request complete");
@@ -1909,12 +1904,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
responseData["saved"] = true;
}
catch (Exception e)
catch
{
responseData["saved"] = false;
responseData["switched"] = false;
throw e;
throw;
}
m_log.Info("[RADMIN]: Save XML Administrator Request complete");