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

Massive tab and trailing space cleanup

Browse Source
This commit is contained in:
Melanie Thielker
2017-01-05 19:07:37 +00:00
parent e88e2945e9
commit b16abc8166
959 changed files with 23646 additions and 23646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Services/GridService/HypergridLinker.cs
View File

@@ -196,7 +196,7 @@ namespace OpenSim.Services.GridService
{
return TryLinkRegionToCoords(scopeID, mapName, xloc, yloc, UUID.Zero, out reason);
}
public bool IsLocalGrid(string serverURI)
{
return serverURI == m_ThisGatekeeper;
@@ -240,7 +240,7 @@ namespace OpenSim.Services.GridService
private bool TryCreateLinkImpl(UUID scopeID, int xloc, int yloc, string remoteRegionName, uint externalPort, string externalHostName, string serverURI, UUID ownerID, out GridRegion regInfo, out string reason)
{
m_log.InfoFormat("[HYPERGRID LINKER]: Link to {0} {1}, in <{2},{3}>",
m_log.InfoFormat("[HYPERGRID LINKER]: Link to {0} {1}, in <{2},{3}>",
((serverURI == null) ? (externalHostName + ":" + externalPort) : serverURI),
remoteRegionName, Util.WorldToRegionLoc((uint)xloc), Util.WorldToRegionLoc((uint)yloc));
@@ -270,7 +270,7 @@ namespace OpenSim.Services.GridService
if (remoteRegionName != string.Empty)
regInfo.RegionName = remoteRegionName;
regInfo.RegionLocX = xloc;
regInfo.RegionLocY = yloc;
regInfo.ScopeID = scopeID;
@@ -359,7 +359,7 @@ namespace OpenSim.Services.GridService
regInfo.RegionName = externalName;
m_log.DebugFormat("[HYPERGRID LINKER]: naming linked region {0}, handle {1}", regInfo.RegionName, handle.ToString());
// Get the map image
regInfo.TerrainImage = GetMapImage(regionID, imageURL);
@@ -383,7 +383,7 @@ namespace OpenSim.Services.GridService
OpenSim.Framework.RegionFlags rflags = (OpenSim.Framework.RegionFlags)Convert.ToInt32(regions[0].Data["flags"]);
if ((rflags & OpenSim.Framework.RegionFlags.Hyperlink) != 0)
{
regInfo = new GridRegion();
regInfo = new GridRegion();
regInfo.RegionID = regions[0].RegionID;
regInfo.ScopeID = m_ScopeID;
}
@@ -491,7 +491,7 @@ namespace OpenSim.Services.GridService
{
MainConsole.Instance.Output(
String.Format("{0}\n{2,-32} {1}\n",
r.RegionName, r.RegionID,
r.RegionName, r.RegionID,
String.Format("{0},{1} ({2},{3})", r.posX, r.posY,
Util.WorldToRegionLoc((uint)r.posX), Util.WorldToRegionLoc((uint)r.posY)
)
@@ -515,7 +515,7 @@ namespace OpenSim.Services.GridService
RunHGCommand(command, cmdparams);
}
private void RunLinkRegionCommand(string[] cmdparams)
{
int xloc, yloc;
@@ -573,7 +573,7 @@ namespace OpenSim.Services.GridService
if (cmdparams[2].StartsWith("http"))
{
RunLinkRegionCommand(cmdparams);
}
}
else if (cmdparams[2].Contains(":"))
{
// New format