ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove some more useless NULL arguments

Browse Source
This commit is contained in:
UbitUmarov
2019-10-22 12:39:50 +01:00
parent b98ad6c53c
commit da0a8d6c43
17 changed files with 45 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@@ -2536,11 +2536,11 @@ namespace OpenSim.Region.CoreModules.World.Land
if (response.ToLower() == "y")
{
Clear(true);
MainConsole.Instance.Output("Cleared all parcels from {0}", null, m_scene.Name);
MainConsole.Instance.Output("Cleared all parcels from {0}", m_scene.Name);
}
else
{
MainConsole.Instance.Output("Aborting clear of all parcels from {0}", null, m_scene.Name);
MainConsole.Instance.Output("Aborting clear of all parcels from {0}", m_scene.Name);
}
}
@@ -2568,7 +2568,7 @@ namespace OpenSim.Region.CoreModules.World.Land
{
if (!m_landList.TryGetValue(landLocalId, out lo))
{
MainConsole.Instance.Output("No parcel found with local ID {0}", null, landLocalId);
MainConsole.Instance.Output("No parcel found with local ID {0}", landLocalId);
return;
}
}

2
OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
View File

@@ -287,7 +287,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
protected void SetPartMediaFlags(SceneObjectPart part, int face, bool flag)
{
Primitive.TextureEntry te = part.Shape.Textures;
Primitive.TextureEntryFace teFace = te.CreateFace((uint)face);
Primitive.TextureEntryFace teFace = te.GetFace((uint)face);
teFace.MediaFlags = flag;
part.Shape.Textures = te;
}

14
OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
View File

@@ -451,7 +451,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector))
{
m_console.Output("Error: Start vector '{0}' does not have a valid format", null, rawConsoleStartVector);
m_console.Output("Error: Start vector '{0}' does not have a valid format", rawConsoleStartVector);
return;
}
@@ -460,7 +460,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector))
{
m_console.Output("Error: End vector '{0}' does not have a valid format", null, rawConsoleEndVector);
m_console.Output("Error: End vector '{0}' does not have a valid format", rawConsoleEndVector);
return;
}
@@ -809,7 +809,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
if(so.IsAttachment)
{
requireConfirmation = true;
m_console.Output("Warning: object with uuid {0} is a attachment", null, uuid);
m_console.Output("Warning: object with uuid {0} is a attachment", uuid);
}
}
break;
@@ -853,7 +853,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
break;
default:
m_console.Output("Unrecognized mode {0}", null, mode);
m_console.Output("Unrecognized mode {0}", mode);
return;
}
@@ -871,17 +871,17 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
if (response.ToLower() != "y")
{
MainConsole.Instance.Output(
"Aborting delete of {0} objects from {1}", null, deletes.Count, m_scene.RegionInfo.RegionName);
"Aborting delete of {0} objects from {1}", deletes.Count, m_scene.RegionInfo.RegionName);
return;
}
}
m_console.Output("Deleting {0} objects in {1}", null, deletes.Count, m_scene.RegionInfo.RegionName);
m_console.Output("Deleting {0} objects in {1}", deletes.Count, m_scene.RegionInfo.RegionName);
foreach (SceneObjectGroup g in deletes)
{
m_console.Output("Deleting object {0} {1}", null, g.UUID, g.Name);
m_console.Output("Deleting object {0} {1}", g.UUID, g.Name);
m_scene.DeleteSceneObject(g, false);
}
}

7
OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
View File

@@ -226,7 +226,6 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
{
MainConsole.Instance.Output(
"Cannot set {0} to {1} in {2} as max-agent-limit is {3}", "agent-limit",
null,
newValue, m_scene.Name, ri.AgentCapacity);
}
else
@@ -234,7 +233,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
rs.AgentLimit = newValue;
MainConsole.Instance.Output(
"{0} set to {1} in {2}", "agent-limit", null, newValue, m_scene.Name);
"{0} set to {1} in {2}", "agent-limit", newValue, m_scene.Name);
}
rs.Save();
@@ -249,14 +248,14 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
ri.AgentCapacity = newValue;
MainConsole.Instance.Output(
"{0} set to {1} in {2}", "max-agent-limit", null, newValue, m_scene.Name);
"max-agent-limit set to {0} in {1}", newValue, m_scene.Name);
if (ri.AgentCapacity < rs.AgentLimit)
{
rs.AgentLimit = ri.AgentCapacity;
MainConsole.Instance.Output(
"Reducing {0} to {1} in {2}", null, "agent-limit", rs.AgentLimit, m_scene.Name);
"agent-limit set to {0} in {1}", rs.AgentLimit, m_scene.Name);
}
rs.Save();

2
OpenSim/Region/CoreModules/World/Region/RestartModule.cs
View File

@@ -338,7 +338,7 @@ namespace OpenSim.Region.CoreModules.World.Region
times.Add(Convert.ToInt32(args[i]));
MainConsole.Instance.Output(
"Region {0} scheduled for restart in {1} seconds", null, m_Scene.Name, times.Sum());
"Region {0} scheduled for restart in {1} seconds", m_Scene.Name, times.Sum());
ScheduleRestart(UUID.Zero, args[3], times.ToArray(), notice);
}

7
OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
View File

@@ -793,7 +793,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
{
MainConsole.Instance.Output(
"ERROR: file width + minimum X tile and file height + minimum Y tile must incorporate the current region at ({0},{1}). File width {2} from {3} and file height {4} from {5} does not.",
null,
m_scene.RegionInfo.RegionLocX, m_scene.RegionInfo.RegionLocY, fileWidth, fileStartX, fileHeight, fileStartY);
return;
@@ -813,7 +812,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
MainConsole.Instance.Output(
"Saved terrain from ({0},{1}) to ({2},{3}) from {4} to {5}",
null,
fileStartX, fileStartY, fileStartX + fileWidth - 1, fileStartY + fileHeight - 1,
m_scene.RegionInfo.RegionName, filename);
}
@@ -824,7 +822,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
MainConsole.Instance.Output(
"ERROR: Could not save terrain from {0} to {1}. Valid file extensions are {2}",
null,
m_scene.RegionInfo.RegionName, filename, m_supportFileExtensionsForTileSave);
}
@@ -1706,8 +1703,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
double avg = sum / (m_channel.Height * m_channel.Width);
MainConsole.Instance.Output("Channel {0}x{1}", null, m_channel.Width, m_channel.Height);
MainConsole.Instance.Output("max/min/avg/sum: {0}/{1}/{2}/{3}", null, max, min, avg, sum);
MainConsole.Instance.Output("Channel {0}x{1}", m_channel.Width, m_channel.Height);
MainConsole.Instance.Output("max/min/avg/sum: {0}/{1}/{2}/{3}", max, min, avg, sum);
}
private void InterfaceEnableExperimentalBrushes(Object[] args)

2
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
View File

@@ -799,7 +799,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
}
catch (Exception e)
{
m_log.WarnFormat("[Warp3D]: Failed to decode texture {0} for prim {1} at {2}, exception {3} ", id.ToString(), sop.Name, sop.GetWorldPosition().ToString(), e.Message);
m_log.WarnFormat("[Warp3D]: Failed to decode texture {0} for prim {1} at {2}, exception {3}", id.ToString(), sop.Name, sop.GetWorldPosition().ToString(), e.Message);
}
}
else

18
OpenSim/Region/CoreModules/World/Wind/WindModule.cs
View File

@@ -265,7 +265,7 @@ namespace OpenSim.Region.CoreModules
else
{
MainConsole.Instance.Output(
"Invalid value {0} specified for {1}", null, cmdparams[3], cmdparams[2]);
"Invalid value {0} specified for {1}", cmdparams[3], cmdparams[2]);
return;
}
@@ -276,7 +276,7 @@ namespace OpenSim.Region.CoreModules
if (desiredPlugin.Equals(m_activeWindPlugin.Name))
{
MainConsole.Instance.Output("Wind model plugin {0} is already active", null, cmdparams[3]);
MainConsole.Instance.Output("Wind model plugin {0} is already active", cmdparams[3]);
return;
}
@@ -285,11 +285,11 @@ namespace OpenSim.Region.CoreModules
{
m_activeWindPlugin = m_availableWindPlugins[cmdparams[3]];
MainConsole.Instance.Output("{0} wind model plugin now active", null, m_activeWindPlugin.Name);
MainConsole.Instance.Output("{0} wind model plugin now active", m_activeWindPlugin.Name);
}
else
{
MainConsole.Instance.Output("Could not find wind model plugin {0}", null, desiredPlugin);
MainConsole.Instance.Output("Could not find wind model plugin {0}", desiredPlugin);
}
break;
}
@@ -317,17 +317,17 @@ namespace OpenSim.Region.CoreModules
{
if (!float.TryParse(cmdparams[3], out value))
{
MainConsole.Instance.Output("Invalid value {0}", null, cmdparams[3]);
MainConsole.Instance.Output("Invalid value {0}", cmdparams[3]);
}
try
{
WindParamSet(plugin, param, value);
MainConsole.Instance.Output("{0} set to {1}", null, param, value);
MainConsole.Instance.Output("{0} set to {1}", param, value);
}
catch (Exception e)
{
MainConsole.Instance.Output("{0}", null, e.Message);
MainConsole.Instance.Output("{0}", e.Message);
}
}
else
@@ -335,11 +335,11 @@ namespace OpenSim.Region.CoreModules
try
{
value = WindParamGet(plugin, param);
MainConsole.Instance.Output("{0} : {1}", null, param, value);
MainConsole.Instance.Output("{0} : {1}", param, value);
}
catch (Exception e)
{
MainConsole.Instance.Output("{0}", null, e.Message);
MainConsole.Instance.Output("{0}", e.Message);
}
}