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

cleaning out warnings. 

NOTE: we currently have a gazillion warnings caused stuff flagged as
"obsolete" (OGS1 stuff) --- what's up with that?
0.6.6-post-fixes
Dr Scofield 2009-05-22 14:57:00 +00:00
parent 912be7a2ac
commit 1d02636c27
27 changed files with 210 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/Capabilities/Caps.cs
View File

@ -89,7 +89,7 @@ namespace OpenSim.Framework.Communications.Capabilities
//private static readonly string m_requestTexture = "0003/";
private static readonly string m_notecardUpdatePath = "0004/";
private static readonly string m_notecardTaskUpdatePath = "0005/";
private static readonly string m_fetchInventoryPath = "0006/";
// private static readonly string m_fetchInventoryPath = "0006/";
// The following entries are in a module, however, they are also here so that we don't re-assign
// the path to another cap by mistake.

2
OpenSim/Framework/Console/LocalConsole.cs
View File

@ -42,7 +42,7 @@ namespace OpenSim.Framework.Console
{
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private readonly object m_syncRoot = new object();
// private readonly object m_syncRoot = new object();
private int y = -1;
private int cp = 0;

8
OpenSim/Framework/Console/RemoteConsole.cs
View File

@ -43,8 +43,8 @@ namespace OpenSim.Framework.Console
{
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IHttpServer m_Server = null;
private IConfigSource m_Config = null;
// private IHttpServer m_Server = null;
// private IConfigSource m_Config = null;
private List<string> m_Scrollback = new List<string>();
private ManualResetEvent m_DataEvent = new ManualResetEvent(false);
@ -57,12 +57,12 @@ namespace OpenSim.Framework.Console
public void ReadConfig(IConfigSource config)
{
m_Config = config;
// m_Config = config;
}
public void SetServer(IHttpServer server)
{
m_Server = server;
// m_Server = server;
}
public override void Output(string text, string level)

2
OpenSim/Framework/Servers/CachedGetAssetStreamHandler.cs
View File

@ -33,7 +33,7 @@ namespace OpenSim.Framework.Servers
{
public class CachedGetAssetStreamHandler : BaseGetAssetStreamHandler
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private readonly IAssetCache m_assetProvider;

2
OpenSim/Framework/Servers/GetAssetStreamHandler.cs
View File

@ -45,7 +45,7 @@ namespace OpenSim.Framework.Servers
{
public class GetAssetStreamHandler : BaseGetAssetStreamHandler
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private readonly IAssetDataPlugin m_assetProvider;

3
OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs
View File

@ -48,7 +48,8 @@ namespace OpenSim.Framework.Servers.HttpServer.Tests
[Test]
public void TestConstructor()
{
BaseRequestHandlerImpl handler = new BaseRequestHandlerImpl( null, null );
// BaseRequestHandlerImpl handler =
new BaseRequestHandlerImpl( null, null );
}
[Test]

3
OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs
View File

@ -48,7 +48,8 @@ namespace OpenSim.Framework.Servers.Tests
{
TestHelper.InMethod();
CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null);
// CachedGetAssetStreamHandler handler =
new CachedGetAssetStreamHandler(null);
}
[Test]

3
OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
View File

@ -49,7 +49,8 @@ namespace OpenSim.Framework.Servers.Tests
{
TestHelper.InMethod();
GetAssetStreamHandler handler = new GetAssetStreamHandler( null );
// GetAssetStreamHandler handler =
new GetAssetStreamHandler( null );
}
[Test]

6
OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs
View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
@ -38,13 +38,13 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
= log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private List<string> bans;
private SceneBase m_scene;
// private SceneBase m_scene;
public SceneBanner(SceneBase scene, List<string> banList)
{
scene.EventManager.OnClientConnect += EventManager_OnClientConnect;
bans = banList;
m_scene = scene;
// m_scene = scene;
}
void EventManager_OnClientConnect(IClientCore client)

2
OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
View File

@ -305,7 +305,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
Primitive.TextureEntry tmptex = part.Shape.Textures;
// remove the old asset from the cache
UUID oldID = tmptex.DefaultTexture.TextureID;
// UUID oldID = tmptex.DefaultTexture.TextureID;
tmptex.DefaultTexture.TextureID = asset.FullID;
// I'm pretty sure we always want to force this to true

22
OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
View File

@ -60,7 +60,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
private btQuaternion m_bodyOrientation;
private btDefaultMotionState m_bodyMotionState;
private btGeneric6DofConstraint m_aMotor;
private PhysicsVector m_movementComparision;
// private PhysicsVector m_movementComparision;
private PhysicsVector m_position;
private PhysicsVector m_zeroPosition;
private bool m_zeroFlag = false;
@ -95,15 +95,15 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
public bool m_tainted_isPhysical = false; // set when the physical status is tainted (false=not existing in physics engine, true=existing)
private float m_tainted_CAPSULE_LENGTH; // set when the capsule length changes.
private bool m_taintRemove = false;
private bool m_taintedPosition = false;
private PhysicsVector m_taintedPosition_value;
// private bool m_taintedPosition = false;
// private PhysicsVector m_taintedPosition_value;
private PhysicsVector m_taintedForce;
private float m_buoyancy = 0f;
// private CollisionLocker ode;
private string m_name = String.Empty;
// private string m_name = String.Empty;
private bool[] m_colliderarr = new bool[11];
private bool[] m_colliderGroundarr = new bool[11];
@ -113,7 +113,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
private BulletDotNETScene m_parent_scene;
public int m_eventsubscription = 0;
private CollisionEventUpdate CollisionEventsThisFrame = new CollisionEventUpdate();
// private CollisionEventUpdate CollisionEventsThisFrame = new CollisionEventUpdate();
public BulletDotNETCharacter(string avName, BulletDotNETScene parent_scene, PhysicsVector pos, PhysicsVector size, float pid_d, float pid_p, float capsule_radius, float tensor, float density, float height_fudge_factor, float walk_divisor, float rundivisor)
{
@ -147,7 +147,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
m_parent_scene.AddPhysicsActorTaint(this);
m_name = avName;
// m_name = avName;
tempVector1 = new btVector3(0, 0, 0);
tempVector2 = new btVector3(0, 0, 0);
tempVector3 = new btVector3(0, 0, 0);
@ -159,7 +159,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
tempQuat1 = new btQuaternion(0, 0, 0, 1);
tempTrans1 = new btTransform(tempQuat1, tempVector1);
m_movementComparision = new PhysicsVector(0, 0, 0);
// m_movementComparision = new PhysicsVector(0, 0, 0);
m_CapsuleOrientationAxis = new btVector3(1, 0, 1);
@ -327,9 +327,9 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
get { return m_position; }
set
{
m_taintedPosition_value = value;
// m_taintedPosition_value = value;
m_position = value;
m_taintedPosition = true;
// m_taintedPosition = true;
}
}
@ -772,7 +772,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
tempQuat1 = new btQuaternion(0, 0, 0, 1);
tempTrans1 = new btTransform(tempQuat1, tempVector1);
m_movementComparision = new PhysicsVector(0, 0, 0);
// m_movementComparision = new PhysicsVector(0, 0, 0);
m_CapsuleOrientationAxis = new btVector3(1, 0, 1);
}
@ -803,7 +803,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
tempQuat1 = new btQuaternion(0, 0, 0, 1);
tempTrans1 = new btTransform(tempQuat1, tempVector1);
m_movementComparision = new PhysicsVector(0, 0, 0);
// m_movementComparision = new PhysicsVector(0, 0, 0);
m_CapsuleOrientationAxis = new btVector3(1, 0, 1);
AvatarGeomAndBodyCreation(m_position.X, m_position.Y,

32
OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
View File

@ -62,7 +62,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
private Quaternion m_taintrot;
private PhysicsVector m_angularlock = new PhysicsVector(1f, 1f, 1f);
private PhysicsVector m_taintAngularLock = new PhysicsVector(1f, 1f, 1f);
private btGeneric6DofConstraint Amotor;
// private btGeneric6DofConstraint Amotor;
private PhysicsVector m_PIDTarget = new PhysicsVector(0, 0, 0);
private float m_PIDTau = 0f;
@ -75,8 +75,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
private float m_waterHeight = 0f;
private float PID_D = 35f;
private float PID_G = 25f;
private float m_tensor = 5f;
private int body_autodisable_frames = 20;
// private float m_tensor = 5f;
// private int body_autodisable_frames = 20;
private IMesh primMesh = null;
private bool m_usePID = false;
@ -90,15 +90,15 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
private bool m_taintshape = false;
private bool m_taintPhysics = false;
private bool m_collidesLand = true;
// private bool m_collidesLand = true;
private bool m_collidesWater = false;
public bool m_returnCollisions = false;
// Default we're a Geometry
private CollisionCategories m_collisionCategories = (CollisionCategories.Geom);
// private CollisionCategories m_collisionCategories = (CollisionCategories.Geom);
// Default, Collide with Other Geometries, spaces and Bodies
private CollisionCategories m_collisionFlags = m_default_collisionFlags;
// private CollisionCategories m_collisionFlags = m_default_collisionFlags;
public bool m_taintremove = false;
public bool m_taintdisable = false;
@ -110,7 +110,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
public uint m_localID = 0;
//public GCHandle gc;
private CollisionLocker ode;
// private CollisionLocker ode;
private bool m_taintforce = false;
private bool m_taintaddangularforce = false;
@ -136,7 +136,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
internal bool m_isVolumeDetect = false; // If true, this prim only detects collisions but doesn't collide actively
private bool m_throttleUpdates = false;
private int throttleCounter = 0;
// private int throttleCounter = 0;
public int m_interpenetrationcount = 0;
public float m_collisionscore = 0;
public int m_roundsUnderMotionThreshold = 0;
@ -155,7 +155,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
private PhysicsVector _target_velocity;
public int m_eventsubscription = 0;
private CollisionEventUpdate CollisionEventsThisFrame = null;
// private CollisionEventUpdate CollisionEventsThisFrame = null;
public volatile bool childPrim = false;
@ -226,8 +226,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
PID_D = parent_scene.bodyPIDD;
PID_G = parent_scene.bodyPIDG;
m_density = parent_scene.geomDefaultDensity;
m_tensor = parent_scene.bodyMotorJointMaxforceTensor;
body_autodisable_frames = parent_scene.bodyFramesAutoDisable;
// m_tensor = parent_scene.bodyMotorJointMaxforceTensor;
// body_autodisable_frames = parent_scene.bodyFramesAutoDisable;
prim_geom = null;
Body = null;
@ -2146,7 +2146,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
}
else
{
bool hasTrimesh = false;
// bool hasTrimesh = false;
lock (childrenPrim)
{
foreach (BulletDotNETPrim chld in childrenPrim)
@ -2154,8 +2154,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
if (chld == null)
continue;
if (chld.NeedsMeshing())
hasTrimesh = true;
// if (chld.NeedsMeshing())
// hasTrimesh = true;
}
}
@ -2517,7 +2517,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
base.RequestPhysicsterseUpdate();
m_throttleUpdates = false;
throttleCounter = 0;
// throttleCounter = 0;
_zeroFlag = true;
//outofBounds = true;
}
@ -2556,7 +2556,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
if (!m_lastUpdateSent)
{
m_throttleUpdates = false;
throttleCounter = 0;
// throttleCounter = 0;
m_rotationalVelocity = pv;
if (_parent == null)

10
OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
View File

@ -44,7 +44,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private string m_sceneIdentifier = string.Empty;
// private string m_sceneIdentifier = string.Empty;
private List<BulletDotNETCharacter> m_characters = new List<BulletDotNETCharacter>();
private List<BulletDotNETPrim> m_prims = new List<BulletDotNETPrim>();
@ -76,7 +76,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
private float avMovementDivisorWalk = 1.8f;
private float avMovementDivisorRun = 0.8f;
private float minimumGroundFlightOffset = 3f;
// private float minimumGroundFlightOffset = 3f;
public bool meshSculptedPrim = true;
@ -98,7 +98,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
private float[] _origheightmap; // Used for Fly height. Kitto Flora
private bool usingGImpactAlgorithm = false;
private IConfigSource m_config;
// private IConfigSource m_config;
private readonly btVector3 worldAabbMin = new btVector3(-10f, -10f, 0);
private readonly btVector3 worldAabbMax = new btVector3((int)Constants.RegionSize + 10f, (int)Constants.RegionSize + 10f, 9000);
@ -107,7 +107,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
public BulletDotNETScene(string sceneIdentifier)
{
m_sceneIdentifier = sceneIdentifier;
// m_sceneIdentifier = sceneIdentifier;
VectorZero = new btVector3(0, 0, 0);
QuatIdentity = new btQuaternion(0, 0, 0, 1);
TransZero = new btTransform(QuatIdentity, VectorZero);
@ -119,7 +119,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
public override void Initialise(IMesher meshmerizer, IConfigSource config)
{
mesher = meshmerizer;
m_config = config;
// m_config = config;
/*
if (Environment.OSVersion.Platform == PlatformID.Unix)
{

60
OpenSim/Region/Physics/Meshing/SculptMesh.cs
View File

@ -46,42 +46,42 @@ namespace PrimMesher
public enum SculptType { sphere = 1, torus = 2, plane = 3, cylinder = 4 };
private Bitmap ScaleImage(Bitmap srcImage, float scale)
{
int sourceWidth = srcImage.Width;
int sourceHeight = srcImage.Height;
int sourceX = 0;
int sourceY = 0;
// private Bitmap ScaleImage(Bitmap srcImage, float scale)
// {
// int sourceWidth = srcImage.Width;
// int sourceHeight = srcImage.Height;
// int sourceX = 0;
// int sourceY = 0;
int destX = 0;
int destY = 0;
int destWidth = (int)(srcImage.Width * scale);
int destHeight = (int)(srcImage.Height * scale);
// int destX = 0;
// int destY = 0;
// int destWidth = (int)(srcImage.Width * scale);
// int destHeight = (int)(srcImage.Height * scale);
if (srcImage.PixelFormat == PixelFormat.Format32bppArgb)
for (int y = 0; y < srcImage.Height; y++)
for (int x = 0; x < srcImage.Width; x++)
{
Color c = srcImage.GetPixel(x, y);
srcImage.SetPixel(x, y, Color.FromArgb(255, c.R, c.G, c.B));
}
// if (srcImage.PixelFormat == PixelFormat.Format32bppArgb)
// for (int y = 0; y < srcImage.Height; y++)
// for (int x = 0; x < srcImage.Width; x++)
// {
// Color c = srcImage.GetPixel(x, y);
// srcImage.SetPixel(x, y, Color.FromArgb(255, c.R, c.G, c.B));
// }
Bitmap scaledImage = new Bitmap(destWidth, destHeight,
PixelFormat.Format24bppRgb);
// Bitmap scaledImage = new Bitmap(destWidth, destHeight,
// PixelFormat.Format24bppRgb);
scaledImage.SetResolution(96.0f, 96.0f);
// scaledImage.SetResolution(96.0f, 96.0f);
Graphics grPhoto = Graphics.FromImage(scaledImage);
grPhoto.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.Low;
// Graphics grPhoto = Graphics.FromImage(scaledImage);
// grPhoto.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.Low;
grPhoto.DrawImage(srcImage,
new Rectangle(destX, destY, destWidth, destHeight),
new Rectangle(sourceX, sourceY, sourceWidth, sourceHeight),
GraphicsUnit.Pixel);
// grPhoto.DrawImage(srcImage,
// new Rectangle(destX, destY, destWidth, destHeight),
// new Rectangle(sourceX, sourceY, sourceWidth, sourceHeight),
// GraphicsUnit.Pixel);
grPhoto.Dispose();
return scaledImage;
}
// grPhoto.Dispose();
// return scaledImage;
// }
public SculptMesh SculptMeshFromFile(string fileName, SculptType sculptType, int lod, bool viewerMode)
{
@ -283,7 +283,7 @@ namespace PrimMesher
viewerFaces = new List<ViewerFace>();
int width = sculptBitmap.Width / scale;
int height = sculptBitmap.Height / scale;
// int height = sculptBitmap.Height / scale;
int p1, p2, p3, p4;

12
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -66,7 +66,7 @@ namespace OpenSim.Region.Physics.OdePlugin
private IntPtr Amotor = IntPtr.Zero;
private PhysicsVector m_PIDTarget = new PhysicsVector(0, 0, 0);
private PhysicsVector m_taintPIDTarget = new PhysicsVector(0, 0, 0);
// private PhysicsVector m_taintPIDTarget = new PhysicsVector(0, 0, 0);
private float m_PIDTau = 0f;
private float PID_D = 35f;
private float PID_G = 25f;
@ -80,7 +80,7 @@ namespace OpenSim.Region.Physics.OdePlugin
private float m_groundHeight = 0f;
private float m_waterHeight = 0f;
private float m_tensor = 5f;
// private float m_tensor = 5f;
private int body_autodisable_frames = 20;
private IMesh primMesh = null;
@ -189,7 +189,7 @@ namespace OpenSim.Region.Physics.OdePlugin
PID_D = parent_scene.bodyPIDD;
PID_G = parent_scene.bodyPIDG;
m_density = parent_scene.geomDefaultDensity;
m_tensor = parent_scene.bodyMotorJointMaxforceTensor;
// m_tensor = parent_scene.bodyMotorJointMaxforceTensor;
body_autodisable_frames = parent_scene.bodyFramesAutoDisable;
@ -2746,11 +2746,9 @@ namespace OpenSim.Region.Physics.OdePlugin
axisnum = (axisnum - (axis.X + axis.Y + axis.Z));
PhysicsVector totalSize = new PhysicsVector(_size.X, _size.Y, _size.Z);
// PhysicsVector totalSize = new PhysicsVector(_size.X, _size.Y, _size.Z);
// Inverse Inertia Matrix, set the X, Y, and/r Z inertia to 0 then invert it again.
d.Mass objMass;
d.MassSetZero(out objMass);
@ -2807,7 +2805,7 @@ namespace OpenSim.Region.Physics.OdePlugin
if (axisnum <= 0)
return;
int dAMotorEuler = 1;
// int dAMotorEuler = 1;
Amotor = d.JointCreateAMotor(_parent_scene.world, IntPtr.Zero);
d.JointAttach(Amotor, Body, IntPtr.Zero);

186
OpenSim/Region/Physics/OdePlugin/ODEVehicleSettings.cs
View File

@ -50,39 +50,39 @@ namespace OpenSim.Region.Physics.OdePlugin
}
private int frcount = 0;
private float frmod = 3.0f;
// private float frmod = 3.0f;
private Vehicle m_type = Vehicle.TYPE_NONE;
private OdeScene m_parentScene = null;
// private OdeScene m_parentScene = null;
private IntPtr m_body = IntPtr.Zero;
private IntPtr m_jointGroup = IntPtr.Zero;
private IntPtr m_aMotor = IntPtr.Zero;
private IntPtr m_lMotor1 = IntPtr.Zero;
private IntPtr m_lMotor2 = IntPtr.Zero;
private IntPtr m_lMotor3 = IntPtr.Zero;
// private IntPtr m_lMotor2 = IntPtr.Zero;
// private IntPtr m_lMotor3 = IntPtr.Zero;
// Vehicle properties
private Quaternion m_referenceFrame = Quaternion.Identity;
// private Quaternion m_referenceFrame = Quaternion.Identity;
private Vector3 m_angularFrictionTimescale = Vector3.Zero;
private Vector3 m_angularMotorDirection = Vector3.Zero;
private Vector3 m_angularMotorDirectionLASTSET = Vector3.Zero;
private Vector3 m_linearFrictionTimescale = Vector3.Zero;
private Vector3 m_linearMotorDirection = Vector3.Zero;
private Vector3 m_linearMotorDirectionLASTSET = Vector3.Zero;
private Vector3 m_linearMotorOffset = Vector3.Zero;
private float m_angularDeflectionEfficiency = 0;
private float m_angularDeflectionTimescale = 0;
// private Vector3 m_linearMotorOffset = Vector3.Zero;
// private float m_angularDeflectionEfficiency = 0;
// private float m_angularDeflectionTimescale = 0;
private float m_angularMotorDecayTimescale = 0;
private float m_angularMotorTimescale = 0;
private float m_bankingEfficiency = 0;
private float m_bankingMix = 0;
private float m_bankingTimescale = 0;
private float m_buoyancy = 0;
private float m_hoverHeight = 0;
private float m_hoverEfficiency = 0;
private float m_hoverTimescale = 0;
private float m_linearDeflectionEfficiency = 0;
private float m_linearDeflectionTimescale = 0;
// private float m_bankingEfficiency = 0;
// private float m_bankingMix = 0;
// private float m_bankingTimescale = 0;
// private float m_buoyancy = 0;
// private float m_hoverHeight = 0;
// private float m_hoverEfficiency = 0;
// private float m_hoverTimescale = 0;
// private float m_linearDeflectionEfficiency = 0;
// private float m_linearDeflectionTimescale = 0;
private float m_linearMotorDecayTimescale = 0;
private float m_linearMotorTimescale = 0;
private float m_verticalAttractionEfficiency = 0;
@ -91,7 +91,7 @@ namespace OpenSim.Region.Physics.OdePlugin
private Vector3 m_lastAngularVelocityVector = Vector3.Zero;
private VehicleFlag m_flags = (VehicleFlag) 0;
private bool m_LinearMotorSetLastFrame = false;
// private bool m_LinearMotorSetLastFrame = false;
@ -102,11 +102,11 @@ namespace OpenSim.Region.Physics.OdePlugin
{
case Vehicle.ANGULAR_DEFLECTION_EFFICIENCY:
if (pValue < 0.01f) pValue = 0.01f;
m_angularDeflectionEfficiency = pValue;
// m_angularDeflectionEfficiency = pValue;
break;
case Vehicle.ANGULAR_DEFLECTION_TIMESCALE:
if (pValue < 0.01f) pValue = 0.01f;
m_angularDeflectionTimescale = pValue;
// m_angularDeflectionTimescale = pValue;
break;
case Vehicle.ANGULAR_MOTOR_DECAY_TIMESCALE:
if (pValue < 0.01f) pValue = 0.01f;
@ -118,36 +118,36 @@ namespace OpenSim.Region.Physics.OdePlugin
break;
case Vehicle.BANKING_EFFICIENCY:
if (pValue < 0.01f) pValue = 0.01f;
m_bankingEfficiency = pValue;
// m_bankingEfficiency = pValue;
break;
case Vehicle.BANKING_MIX:
if (pValue < 0.01f) pValue = 0.01f;
m_bankingMix = pValue;
// m_bankingMix = pValue;
break;
case Vehicle.BANKING_TIMESCALE:
if (pValue < 0.01f) pValue = 0.01f;
m_bankingTimescale = pValue;
// m_bankingTimescale = pValue;
break;
case Vehicle.BUOYANCY:
m_buoyancy = pValue;
// m_buoyancy = pValue;
break;
case Vehicle.HOVER_EFFICIENCY:
m_hoverEfficiency = pValue;
// m_hoverEfficiency = pValue;
break;
case Vehicle.HOVER_HEIGHT:
m_hoverHeight = pValue;
// m_hoverHeight = pValue;
break;
case Vehicle.HOVER_TIMESCALE:
if (pValue < 0.01f) pValue = 0.01f;
m_hoverTimescale = pValue;
// m_hoverTimescale = pValue;
break;
case Vehicle.LINEAR_DEFLECTION_EFFICIENCY:
if (pValue < 0.01f) pValue = 0.01f;
m_linearDeflectionEfficiency = pValue;
// m_linearDeflectionEfficiency = pValue;
break;
case Vehicle.LINEAR_DEFLECTION_TIMESCALE:
if (pValue < 0.01f) pValue = 0.01f;
m_linearDeflectionTimescale = pValue;
// m_linearDeflectionTimescale = pValue;
break;
case Vehicle.LINEAR_MOTOR_DECAY_TIMESCALE:
if (pValue < 0.01f) pValue = 0.01f;
@ -183,7 +183,7 @@ namespace OpenSim.Region.Physics.OdePlugin
m_linearMotorDirectionLASTSET = new Vector3(pValue, pValue, pValue);
break;
case Vehicle.LINEAR_MOTOR_OFFSET:
m_linearMotorOffset = new Vector3(pValue, pValue, pValue);
// m_linearMotorOffset = new Vector3(pValue, pValue, pValue);
break;
}
@ -209,7 +209,7 @@ namespace OpenSim.Region.Physics.OdePlugin
m_linearMotorDirectionLASTSET = new Vector3(pValue.X, pValue.Y, pValue.Z);
break;
case Vehicle.LINEAR_MOTOR_OFFSET:
m_linearMotorOffset = new Vector3(pValue.X, pValue.Y, pValue.Z);
// m_linearMotorOffset = new Vector3(pValue.X, pValue.Y, pValue.Z);
break;
}
Reset();
@ -220,7 +220,7 @@ namespace OpenSim.Region.Physics.OdePlugin
switch (pParam)
{
case Vehicle.REFERENCE_FRAME:
m_referenceFrame = pValue;
// m_referenceFrame = pValue;
break;
}
Reset();
@ -265,7 +265,7 @@ namespace OpenSim.Region.Physics.OdePlugin
return;
m_body = pBody;
m_parentScene = pParentScene;
// m_parentScene = pParentScene;
if (m_jointGroup == IntPtr.Zero)
m_jointGroup = d.JointGroupCreate(3);
@ -341,18 +341,18 @@ namespace OpenSim.Region.Physics.OdePlugin
m_angularMotorDirection = Vector3.Zero;
m_angularMotorTimescale = 1000;
m_angularMotorDecayTimescale = 120;
m_hoverHeight = 0;
m_hoverEfficiency = 10;
m_hoverTimescale = 10;
m_buoyancy = 0;
m_linearDeflectionEfficiency = 1;
m_linearDeflectionTimescale = 1;
m_angularDeflectionEfficiency = 1;
m_angularDeflectionTimescale = 1000;
m_bankingEfficiency = 0;
m_bankingMix = 1;
m_bankingTimescale = 10;
m_referenceFrame = Quaternion.Identity;
// m_hoverHeight = 0;
// m_hoverEfficiency = 10;
// m_hoverTimescale = 10;
// m_buoyancy = 0;
// m_linearDeflectionEfficiency = 1;
// m_linearDeflectionTimescale = 1;
// m_angularDeflectionEfficiency = 1;
// m_angularDeflectionTimescale = 1000;
// m_bankingEfficiency = 0;
// m_bankingMix = 1;
// m_bankingTimescale = 10;
// m_referenceFrame = Quaternion.Identity;
m_flags &=
~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
@ -367,20 +367,20 @@ namespace OpenSim.Region.Physics.OdePlugin
m_angularMotorDirection = Vector3.Zero;
m_angularMotorTimescale = 1;
m_angularMotorDecayTimescale = 0.8f;
m_hoverHeight = 0;
m_hoverEfficiency = 0;
m_hoverTimescale = 1000;
m_buoyancy = 0;
m_linearDeflectionEfficiency = 1;
m_linearDeflectionTimescale = 2;
m_angularDeflectionEfficiency = 0;
m_angularDeflectionTimescale = 10;
// m_hoverHeight = 0;
// // m_hoverEfficiency = 0;
// // m_hoverTimescale = 1000;
// // m_buoyancy = 0;
// // m_linearDeflectionEfficiency = 1;
// // m_linearDeflectionTimescale = 2;
// // m_angularDeflectionEfficiency = 0;
// m_angularDeflectionTimescale = 10;
m_verticalAttractionEfficiency = 1;
m_verticalAttractionTimescale = 10;
m_bankingEfficiency = -0.2f;
m_bankingMix = 1;
m_bankingTimescale = 1;
m_referenceFrame = Quaternion.Identity;
// m_bankingEfficiency = -0.2f;
// m_bankingMix = 1;
// m_bankingTimescale = 1;
// m_referenceFrame = Quaternion.Identity;
m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_UP_ONLY |
VehicleFlag.LIMIT_MOTOR_UP);
@ -394,20 +394,20 @@ namespace OpenSim.Region.Physics.OdePlugin
m_angularMotorDirection = Vector3.Zero;
m_angularMotorTimescale = 4;
m_angularMotorDecayTimescale = 4;
m_hoverHeight = 0;
m_hoverEfficiency = 0.5f;
m_hoverTimescale = 2;
m_buoyancy = 1;
m_linearDeflectionEfficiency = 0.5f;
m_linearDeflectionTimescale = 3;
m_angularDeflectionEfficiency = 0.5f;
m_angularDeflectionTimescale = 5;
// m_hoverHeight = 0;
// m_hoverEfficiency = 0.5f;
// m_hoverTimescale = 2;
// m_buoyancy = 1;
// m_linearDeflectionEfficiency = 0.5f;
// m_linearDeflectionTimescale = 3;
// m_angularDeflectionEfficiency = 0.5f;
// m_angularDeflectionTimescale = 5;
m_verticalAttractionEfficiency = 0.5f;
m_verticalAttractionTimescale = 5;
m_bankingEfficiency = -0.3f;
m_bankingMix = 0.8f;
m_bankingTimescale = 1;
m_referenceFrame = Quaternion.Identity;
// m_bankingEfficiency = -0.3f;
// m_bankingMix = 0.8f;
// m_bankingTimescale = 1;
// m_referenceFrame = Quaternion.Identity;
m_flags &= ~( VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_UP_ONLY |
VehicleFlag.LIMIT_MOTOR_UP);
@ -421,20 +421,20 @@ namespace OpenSim.Region.Physics.OdePlugin
m_angularMotorDirection = Vector3.Zero;
m_angularMotorTimescale = 4;
m_angularMotorDecayTimescale = 4;
m_hoverHeight = 0;
m_hoverEfficiency = 0.5f;
m_hoverTimescale = 1000;
m_buoyancy = 0;
m_linearDeflectionEfficiency = 0.5f;
m_linearDeflectionTimescale = 3;
m_angularDeflectionEfficiency = 1;
m_angularDeflectionTimescale = 2;
// m_hoverHeight = 0;
// m_hoverEfficiency = 0.5f;
// m_hoverTimescale = 1000;
// m_buoyancy = 0;
// m_linearDeflectionEfficiency = 0.5f;
// m_linearDeflectionTimescale = 3;
// m_angularDeflectionEfficiency = 1;
// m_angularDeflectionTimescale = 2;
m_verticalAttractionEfficiency = 0.9f;
m_verticalAttractionTimescale = 2;
m_bankingEfficiency = 1;
m_bankingMix = 0.7f;
m_bankingTimescale = 2;
m_referenceFrame = Quaternion.Identity;
// m_bankingEfficiency = 1;
// m_bankingMix = 0.7f;
// m_bankingTimescale = 2;
// m_referenceFrame = Quaternion.Identity;
m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY);
@ -448,20 +448,20 @@ namespace OpenSim.Region.Physics.OdePlugin
m_angularMotorDirection = Vector3.Zero;
m_angularMotorTimescale = 6;
m_angularMotorDecayTimescale = 10;
m_hoverHeight = 5;
m_hoverEfficiency = 0.8f;
m_hoverTimescale = 10;
m_buoyancy = 1;
m_linearDeflectionEfficiency = 0;
m_linearDeflectionTimescale = 5;
m_angularDeflectionEfficiency = 0;
m_angularDeflectionTimescale = 5;
// m_hoverHeight = 5;
// m_hoverEfficiency = 0.8f;
// m_hoverTimescale = 10;
// m_buoyancy = 1;
// m_linearDeflectionEfficiency = 0;
// m_linearDeflectionTimescale = 5;
// m_angularDeflectionEfficiency = 0;
// m_angularDeflectionTimescale = 5;
m_verticalAttractionEfficiency = 1;
m_verticalAttractionTimescale = 1000;
m_bankingEfficiency = 0;
m_bankingMix = 0.7f;
m_bankingTimescale = 5;
m_referenceFrame = Quaternion.Identity;
// m_bankingEfficiency = 0;
// m_bankingMix = 0.7f;
// m_bankingTimescale = 5;
// m_referenceFrame = Quaternion.Identity;
m_flags = (VehicleFlag)0;
break;

2
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@ -1038,7 +1038,7 @@ namespace OpenSim.Region.Physics.OdePlugin
if (p2.PhysicsActorType == (int)ActorTypes.Prim && p1.PhysicsActorType == (int)ActorTypes.Prim)
{
// prim prim contact
int pj294950 = 0;
// int pj294950 = 0;
int movintYN = 0;
// prim terrain contact
if (Math.Abs(p2.Velocity.X) > 0.01f || Math.Abs(p2.Velocity.Y) > 0.01f)

24
OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs
View File

@ -79,7 +79,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
/// </summary>
private Dictionary<ulong, Scene> m_scenel = new Dictionary<ulong, Scene>();
private int m_stipend = 1000;
// private int m_stipend = 1000;
private int ObjectCapacity = 45000;
private int ObjectCount = 0;
@ -471,8 +471,8 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
public XmlRpcResponse quote_func(XmlRpcRequest request)
{
Hashtable requestData = (Hashtable) request.Params[0];
UUID agentId = UUID.Zero;
// Hashtable requestData = (Hashtable) request.Params[0];
// UUID agentId = UUID.Zero;
int amount = 0;
Hashtable quoteResponse = new Hashtable();
XmlRpcResponse returnval = new XmlRpcResponse();
@ -495,9 +495,9 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
public XmlRpcResponse buy_func(XmlRpcRequest request)
{
Hashtable requestData = (Hashtable) request.Params[0];
UUID agentId = UUID.Zero;
int amount = 0;
// Hashtable requestData = (Hashtable) request.Params[0];
// UUID agentId = UUID.Zero;
// int amount = 0;
XmlRpcResponse returnval = new XmlRpcResponse();
Hashtable returnresp = new Hashtable();
@ -545,10 +545,10 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
{
XmlRpcResponse ret = new XmlRpcResponse();
Hashtable retparam = new Hashtable();
Hashtable requestData = (Hashtable) request.Params[0];
// Hashtable requestData = (Hashtable) request.Params[0];
UUID agentId = UUID.Zero;
int amount = 0;
// UUID agentId = UUID.Zero;
// int amount = 0;
retparam.Add("success", true);
ret.Value = retparam;
@ -581,10 +581,10 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
return returnfunds;
}
private void SetLocalFundsForAgentID(UUID AgentID, int amount)
{
// private void SetLocalFundsForAgentID(UUID AgentID, int amount)
// {
}
// }
#endregion

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -8114,7 +8114,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// ScriptSleep(1000);
return tid.ToString();
}
catch(Exception e)
catch(Exception)
{
//m_log.Error("[LSL_API]: llRequestSimulatorData" + e.ToString());
return UUID.Zero.ToString();

1
OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs
View File

@ -18785,7 +18785,6 @@ public override TOKEN OldAction(Lexer yym,ref string yytext,int action, ref bool
case 946: { ((LSLTokens)yym).str += yytext; }
break;
case 1010: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); }
break;
case 1015: { yym.yy_begin("COMMENT"); }
break;
case 1027: { yym.yy_begin("YYINITIAL"); }

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

@ -266,7 +266,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
//m_ScriptSponsor = scriptSponsor;
}
catch (Exception e)
catch (Exception)
{
// m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly);
}
@ -283,7 +283,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
part.SetScriptEvents(m_ItemID,
(int)m_Script.GetStateEventFlags(State));
}
catch (Exception e)
catch (Exception)
{
// m_log.Error("[Script] Error loading script instance\n"+e.ToString());
return;
@ -350,7 +350,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
// m_log.Error("[Script] Unable to load script state: Memory limit exceeded");
}
}
catch (Exception e)
catch (Exception)
{
// m_log.ErrorFormat("[Script] Unable to load script state from xml: {0}\n"+e.ToString(), xml);
}
@ -455,10 +455,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
public void VarDump(Dictionary<string, object> vars)
{
// m_log.Info("Variable dump for script "+ m_ItemID.ToString());
foreach (KeyValuePair<string, object> v in vars)
{
// foreach (KeyValuePair<string, object> v in vars)
// {
// m_log.Info("Variable: "+v.Key+" = "+v.Value.ToString());
}
// }
}
public void Start()
@ -727,15 +727,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
part.AbsolutePosition,
part.Name, part.UUID, false);
}
catch (Exception e2) // LEGIT: User Scripting
catch (Exception)
{
}
// catch (Exception e2) // LEGIT: User Scripting
// {
// m_log.Error("[SCRIPT]: "+
// "Error displaying error in-world: " +
// e2.ToString());
// m_log.Error("[SCRIPT]: " +
// "Errormessage: Error compiling script:\r\n" +
// e.ToString());
}
// }
}
else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException))
{
@ -890,7 +893,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
fs.Write(buf, 0, buf.Length);
fs.Close();
}
catch(Exception e)
catch(Exception)
{
// m_log.Error("Unable to save xml\n"+e.ToString());
}

4
OpenSim/Server/Base/HttpServerBase.cs
View File

@ -39,9 +39,7 @@ namespace OpenSim.Server.Base
{
// Logger
//
private static readonly ILog m_log =
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// The http server instance
//

4
OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
View File

@ -44,9 +44,7 @@ namespace OpenSim.Server.Handlers.Asset
{
public class AssetServerDeleteHandler : BaseStreamHandler
{
private static readonly ILog m_log =
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IAssetService m_AssetService;

4
OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
View File

@ -44,9 +44,7 @@ namespace OpenSim.Server.Handlers.Asset
{
public class AssetServerGetHandler : BaseStreamHandler
{
private static readonly ILog m_log =
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IAssetService m_AssetService;

4
OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
View File

@ -44,9 +44,7 @@ namespace OpenSim.Server.Handlers.Asset
{
public class AssetServerPostHandler : BaseStreamHandler
{
private static readonly ILog m_log =
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IAssetService m_AssetService;

2
OpenSim/Services/AssetService/HGAssetService.cs
View File

@ -49,7 +49,7 @@ namespace OpenSim.Services.AssetService
IConfig moduleConfig = source.Configs["Modules"];
if (moduleConfig != null)
{
string name = moduleConfig.GetString("AssetServices", "");
// string name = moduleConfig.GetString("AssetServices", "");
IConfig assetConfig = source.Configs["AssetService"];
if (assetConfig == null)

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

@ -84,7 +84,7 @@ namespace OpenSim.Services.Base
return null;
}
catch (Exception e)
catch (Exception)
{
return null;
}