OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shut up some pesty warnings

httptests
UbitUmarov 2018-01-15 16:23:19 +00:00
parent 7a09a10f58
commit c92ba1cc04
15 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1934,7 +1934,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
GetSceneFromRegionParams(requestData, responseData, out scene); GetSceneFromRegionParams(requestData, responseData, out scene);
health = scene.GetHealth(out flags, out text); health = scene.GetHealth(out flags, out text);
} }
catch (Exception e) catch
{ {
responseData["error"] = null; responseData["error"] = null;
} }

2
OpenSim/Framework/Monitoring/JobEngine.cs
View File

@ -238,7 +238,7 @@ namespace OpenSim.Framework.Monitoring
break; break;
} }
} }
catch(ObjectDisposedException e) catch(ObjectDisposedException)
{ {
m_log.DebugFormat("[JobEngine] {0} stopping ignoring {1} jobs in queue", m_log.DebugFormat("[JobEngine] {0} stopping ignoring {1} jobs in queue",
Name,m_jobQueue.Count); Name,m_jobQueue.Count);

3
OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
View File

@ -130,7 +130,8 @@ namespace OpenSim.Framework.Servers.HttpServer
response.OutputStream.Flush(); response.OutputStream.Flush();
response.Send(); response.Send();
} }
catch (Exception e) // catch (Exception e)
catch
{ {
} }
} }

2
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
View File

@ -809,7 +809,7 @@ namespace OpenSim.Region.CoreModules.Asset
return; return;
} }
catch (UnauthorizedAccessException e) catch (UnauthorizedAccessException)
{ {
} }
finally finally

3
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
View File

@ -666,7 +666,8 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
ResponseBody = e.Message; ResponseBody = e.Message;
} }
} }
catch (Exception e) // catch (Exception e)
catch
{ {
// Don't crash on anything else // Don't crash on anything else
} }

4
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@ -1396,9 +1396,9 @@ namespace OpenSim.Region.CoreModules.World.Land
byte[] tempConvertArr = new byte[LandBitmap.GetLength(0) * LandBitmap.GetLength(1) / 8]; byte[] tempConvertArr = new byte[LandBitmap.GetLength(0) * LandBitmap.GetLength(1) / 8];
int tempByte = 0; int tempByte = 0;
int i, byteNum = 0; int byteNum = 0;
int mask = 1; int mask = 1;
i = 0;
for (int y = 0; y < LandBitmap.GetLength(1); y++) for (int y = 0; y < LandBitmap.GetLength(1); y++)
{ {
for (int x = 0; x < LandBitmap.GetLength(0); x++) for (int x = 0; x < LandBitmap.GetLength(0); x++)

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

@ -47,7 +47,6 @@ namespace OpenSim.Region.CoreModules
private uint m_frame = 0; private uint m_frame = 0;
private int m_dataVersion = 0; private int m_dataVersion = 0;
private int m_regionID = 0;
private int m_frameUpdateRate = 150; private int m_frameUpdateRate = 150;
//private Random m_rndnums = new Random(Environment.TickCount); //private Random m_rndnums = new Random(Environment.TickCount);
private Scene m_scene = null; private Scene m_scene = null;

24
OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
View File

@ -497,7 +497,7 @@ namespace OpenSim.Region.Framework.Scenes
m_group.RootPart.Velocity = Vector3.Zero; m_group.RootPart.Velocity = Vector3.Zero;
m_group.RootPart.AngularVelocity = Vector3.Zero; m_group.RootPart.AngularVelocity = Vector3.Zero;
m_skippedUpdates = 1000; // m_skippedUpdates = 1000;
// m_group.SendGroupRootTerseUpdate(); // m_group.SendGroupRootTerseUpdate();
m_group.RootPart.ScheduleTerseUpdate(); m_group.RootPart.ScheduleTerseUpdate();
m_group.Scene.EventManager.TriggerMovingEndEvent(m_group.RootPart.LocalId); m_group.Scene.EventManager.TriggerMovingEndEvent(m_group.RootPart.LocalId);
@ -521,7 +521,7 @@ namespace OpenSim.Region.Framework.Scenes
return; return;
if (m_running && !m_waitingCrossing) if (m_running && !m_waitingCrossing)
StartTimer(); StartTimer();
m_skippedUpdates = 1000; // m_skippedUpdates = 1000;
} }
} }
@ -652,10 +652,10 @@ namespace OpenSim.Region.Framework.Scenes
m_frames.Clear(); m_frames.Clear();
} }
[NonSerialized()] Vector3 m_lastPosUpdate; // [NonSerialized()] Vector3 m_lastPosUpdate;
[NonSerialized()] Quaternion m_lastRotationUpdate; // [NonSerialized()] Quaternion m_lastRotationUpdate;
[NonSerialized()] Vector3 m_currentVel; [NonSerialized()] Vector3 m_currentVel;
[NonSerialized()] int m_skippedUpdates; // [NonSerialized()] int m_skippedUpdates;
[NonSerialized()] double m_lasttickMS; [NonSerialized()] double m_lasttickMS;
private void DoOnTimer(double tickDuration) private void DoOnTimer(double tickDuration)
@ -669,14 +669,14 @@ namespace OpenSim.Region.Framework.Scenes
if (m_group == null) if (m_group == null)
return; return;
bool update = false; // bool update = false;
if (m_selected) if (m_selected)
{ {
if (m_group.RootPart.Velocity != Vector3.Zero) if (m_group.RootPart.Velocity != Vector3.Zero)
{ {
m_group.RootPart.Velocity = Vector3.Zero; m_group.RootPart.Velocity = Vector3.Zero;
m_skippedUpdates = 1000; // m_skippedUpdates = 1000;
// m_group.SendGroupRootTerseUpdate(); // m_group.SendGroupRootTerseUpdate();
m_group.RootPart.ScheduleTerseUpdate(); m_group.RootPart.ScheduleTerseUpdate();
} }
@ -690,7 +690,7 @@ namespace OpenSim.Region.Framework.Scenes
// retry to set the position that evtually caused the outbound // retry to set the position that evtually caused the outbound
// if still outside region this will call startCrossing below // if still outside region this will call startCrossing below
m_isCrossing = false; m_isCrossing = false;
m_skippedUpdates = 1000; // m_skippedUpdates = 1000;
m_group.AbsolutePosition = m_nextPosition; m_group.AbsolutePosition = m_nextPosition;
if (!m_isCrossing) if (!m_isCrossing)
@ -724,7 +724,7 @@ namespace OpenSim.Region.Framework.Scenes
m_currentFrame.TimeMS += (int)tickDuration; m_currentFrame.TimeMS += (int)tickDuration;
m_lasttickMS = nowMS - 50f; m_lasttickMS = nowMS - 50f;
update = true; // update = true;
} }
int elapsed = (int)(nowMS - m_lasttickMS); int elapsed = (int)(nowMS - m_lasttickMS);
@ -761,7 +761,7 @@ namespace OpenSim.Region.Framework.Scenes
else else
m_group.RootPart.Velocity = Vector3.Zero; m_group.RootPart.Velocity = Vector3.Zero;
} }
update = true; // update = true;
} }
else else
{ {
@ -858,7 +858,7 @@ namespace OpenSim.Region.Framework.Scenes
if (m_group.RootPart.Velocity != Vector3.Zero) if (m_group.RootPart.Velocity != Vector3.Zero)
{ {
m_group.RootPart.Velocity = Vector3.Zero; m_group.RootPart.Velocity = Vector3.Zero;
m_skippedUpdates = 1000; // m_skippedUpdates = 1000;
// m_group.SendGroupRootTerseUpdate(); // m_group.SendGroupRootTerseUpdate();
m_group.RootPart.ScheduleTerseUpdate(); m_group.RootPart.ScheduleTerseUpdate();
} }
@ -871,7 +871,7 @@ namespace OpenSim.Region.Framework.Scenes
if (m_group != null) if (m_group != null)
{ {
m_group.RootPart.Velocity = Vector3.Zero; m_group.RootPart.Velocity = Vector3.Zero;
m_skippedUpdates = 1000; // m_skippedUpdates = 1000;
// m_group.SendGroupRootTerseUpdate(); // m_group.SendGroupRootTerseUpdate();
m_group.RootPart.ScheduleTerseUpdate(); m_group.RootPart.ScheduleTerseUpdate();

2
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
View File

@ -1401,7 +1401,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
value = reader.ReadElementContentAsString("Media", String.Empty); value = reader.ReadElementContentAsString("Media", String.Empty);
shp.Media = PrimitiveBaseShape.MediaList.FromXml(value); shp.Media = PrimitiveBaseShape.MediaList.FromXml(value);
} }
catch (XmlException e) catch (XmlException)
{ {
// There are versions of OAR files that contain unquoted XML. // There are versions of OAR files that contain unquoted XML.
// ie ONE comercial fork that never wanted their oars to be read by our code // ie ONE comercial fork that never wanted their oars to be read by our code

4
OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
View File

@ -163,7 +163,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
{ {
// Console.WriteLine("Simulating"); // Console.WriteLine("Simulating");
float fps = 0; float fps = 1.0f / timeStep;
for (int i = 0; i < _actors.Count; ++i) for (int i = 0; i < _actors.Count; ++i)
{ {
BasicActor actor = _actors[i]; BasicActor actor = _actors[i];
@ -226,7 +226,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
actor.Velocity = actorVelocity; actor.Velocity = actorVelocity;
} }
return 1.0f; return fps;
} }
public override void GetResults() public override void GetResults()

1
OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs
View File

@ -92,6 +92,7 @@ public sealed class BSCharacter : BSPhysObject
Density = BSParam.AvatarDensity; Density = BSParam.AvatarDensity;
_isPhysical = true; _isPhysical = true;
_footOffset = footOffset;
// Adjustments for zero X and Y made in Size() // Adjustments for zero X and Y made in Size()
// This also computes avatar scale, volume, and mass // This also computes avatar scale, volume, and mass
SetAvatarSize(size, footOffset, true /* initializing */); SetAvatarSize(size, footOffset, true /* initializing */);

2
OpenSim/Region/PhysicsModules/BulletS/Tests/Raycast.cs
View File

@ -51,7 +51,7 @@ namespace OpenSim.Region.PhysicsModule.BulletS.Tests
BSScene _physicsScene { get; set; } BSScene _physicsScene { get; set; }
BSPrim _targetSphere { get; set; } BSPrim _targetSphere { get; set; }
Vector3 _targetSpherePosition { get; set; } Vector3 _targetSpherePosition { get; set; }
float _simulationTimeStep = 0.089f; // float _simulationTimeStep = 0.089f;
uint _targetLocalID = 123; uint _targetLocalID = 123;

5
OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
View File

@ -340,7 +340,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
faces = new List<Face>(); faces = new List<Face>();
OSD meshOsd = null; OSD meshOsd = null;
if (primShape.SculptData == null || primShape.SculptData.Length <= 0) if (primShape.SculptData.Length <= 0)
{ {
// m_log.InfoFormat("[MESH]: asset data for {0} is zero length", primName); // m_log.InfoFormat("[MESH]: asset data for {0} is zero length", primName);
return false; return false;
@ -363,7 +363,6 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[MESH]: Exception deserializing mesh asset header:" + e.ToString()); m_log.Error("[MESH]: Exception deserializing mesh asset header:" + e.ToString());
return false;
} }
start = data.Position; start = data.Position;
@ -1383,7 +1382,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
{ {
File.Delete(filename); File.Delete(filename);
} }
catch (IOException e) catch (IOException)
{ {
m_log.ErrorFormat( m_log.ErrorFormat(
"[MESH CACHE]: Failed to delete file {0}",filename); "[MESH CACHE]: Failed to delete file {0}",filename);

1
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -771,7 +771,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
/// <returns></returns> /// <returns></returns>
public object EventProcessor() public object EventProcessor()
{ {
EventParams data = null;
// We check here as the thread stopping this instance from running may itself hold the m_Script lock. // We check here as the thread stopping this instance from running may itself hold the m_Script lock.
if (!Running) if (!Running)
return 0; return 0;

3
OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
View File

@ -151,7 +151,8 @@ namespace OpenSim.Services.Connectors
os.Write(buffer, 0, strBuffer.Length); //Send it os.Write(buffer, 0, strBuffer.Length); //Send it
//m_log.InfoFormat("[REST COMMS]: Posted HelloNeighbour request to remote sim {0}", uri); //m_log.InfoFormat("[REST COMMS]: Posted HelloNeighbour request to remote sim {0}", uri);
} }
catch (Exception e) // catch (Exception e)
catch
{ {
// m_log.WarnFormat( // m_log.WarnFormat(
// "[NEIGHBOUR SERVICE CONNCTOR]: Unable to send HelloNeighbour from {0} to {1}. Exception {2}{3}", // "[NEIGHBOUR SERVICE CONNCTOR]: Unable to send HelloNeighbour from {0} to {1}. Exception {2}{3}",