diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index 3a32ba9be0..cf82103868 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs @@ -115,7 +115,7 @@ namespace OpenSim.Framework.UserManagement pickerlist = plugin.Value.GeneratePickerResults(queryID, query); } - catch (Exception e) + catch (Exception) { MainLog.Instance.Verbose("Unable to generate AgentPickerData via " + plugin.Key + "(" + query + ")"); return new List(); @@ -326,7 +326,7 @@ namespace OpenSim.Framework.UserManagement try { string[] parts = startLoc.Remove(0, 4).Split('&'); - string region = parts[0]; + //string region = parts[0]; //////////////////////////////////////////////////// //SimProfile SimInfo = new SimProfile(); diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index cfd15fc347..7ef4205e69 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -301,7 +301,7 @@ namespace OpenSim.Framework public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) { - if (MasterAvatarAssignedUUID == null || MasterAvatarAssignedUUID.ToStringHyphenated() == LLUUID.Zero.ToStringHyphenated()) + if (MasterAvatarAssignedUUID.Equals(null) || MasterAvatarAssignedUUID.ToStringHyphenated() == LLUUID.Zero.ToStringHyphenated()) { return true; } diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index 70a99f0ecf..4aaa0119c8 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs @@ -1382,7 +1382,7 @@ namespace OpenSim.Region.ClientStack pos.X = 100f; objdata.ID = 8880000; objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0"); - LLVector3 pos2 = new LLVector3(100f, 100f, 23f); + //LLVector3 pos2 = new LLVector3(100f, 100f, 23f); //objdata.FullID=user.AgentId; byte[] pb = pos.GetBytes(); Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length); diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs index d5edc6d6b8..a78e4f63fa 100644 --- a/OpenSim/Region/Environment/Modules/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/ChatModule.cs @@ -67,7 +67,7 @@ namespace OpenSim.Region.Environment.Modules m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance); m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance); } - catch (Exception e) + catch (Exception) { } @@ -304,7 +304,7 @@ namespace OpenSim.Region.Environment.Modules m_enabled = true; } } - catch (Exception e) + catch (Exception) { Console.WriteLine("No IRC config information, skipping IRC bridge configuration"); } diff --git a/OpenSim/Region/Environment/Modules/SunModule.cs b/OpenSim/Region/Environment/Modules/SunModule.cs index 35987986b5..c941b1e687 100644 --- a/OpenSim/Region/Environment/Modules/SunModule.cs +++ b/OpenSim/Region/Environment/Modules/SunModule.cs @@ -59,7 +59,7 @@ namespace OpenSim.Region.Environment.Modules try { m_day_length = config.Configs["Sun"].GetDouble("day_length", 0.5); m_frame_mod = config.Configs["Sun"].GetInt("frame_rate", 100); - } catch (Exception e) { + } catch (Exception) { m_day_length = 0.5; m_frame_mod = 100; } diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs index 434c92f782..1223f5c74e 100644 --- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs +++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs @@ -153,7 +153,7 @@ namespace OpenSim.Region.Environment.Modules } } - if ((channel == null) || (channel.Equals(LLUUID.Zero))) + if ((channel.Equals(null)) || (channel.Equals(LLUUID.Zero))) { channel = LLUUID.Random(); RPCChannelInfo rpcChanInfo = new RPCChannelInfo(localID, itemID, channel); diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 18fe7856fa..76fe4b66f2 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs @@ -841,7 +841,7 @@ namespace OpenSim.Region.Environment.Scenes IsPhantom = (data[i++] != 0) ? true : false; CastsShadows = (data[i++] != 0) ? true : false; } - catch (Exception e) + catch (Exception) { Console.WriteLine("Ignoring invalid Packet:"); //Silently ignore it - TODO: FIXME Quick diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index b6daad6e1f..38523e0c6e 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -439,7 +439,6 @@ namespace OpenSim.Region.Environment.Scenes /// public void StopMovement() { - int x = 0; } public void AddNeighbourRegion(ulong regionHandle) @@ -624,8 +623,6 @@ namespace OpenSim.Region.Environment.Scenes { pos = part.AbsolutePosition + offset; - double dist = AbsolutePosition.GetDistanceTo(pos); - if (m_physicsActor != null) { m_sitAvatarHeight = m_physicsActor.Size.Z; @@ -633,7 +630,7 @@ namespace OpenSim.Region.Environment.Scenes // this doesn't seem to quite work yet.... // // if we're close, set the avatar position to the target position and forgo autopilot -// if (dist < 2.5) +// if (AbsolutePosition.GetDistanceTo(pos) < 2.5) // { // autopilot = false; // AbsolutePosition = pos + new LLVector3(0.0f, 0.0f, m_sitAvatarHeight); diff --git a/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs b/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs index 7b1420bfd6..b3084a216b 100644 --- a/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs +++ b/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs @@ -39,7 +39,7 @@ namespace SimpleApp public FileSystemObject(Scene world, FileInfo fileInfo, LLVector3 pos) : base(world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, BoxShape.Default) { - float size = (float) Math.Pow((double) fileInfo.Length, (double) 1/3)/5; + //float size = (float) Math.Pow((double) fileInfo.Length, (double) 1/3)/5; // rootPrimitive.ResizeGoup(new LLVector3(size, size, size)); Text = fileInfo.Name; ScheduleGroupForFullUpdate(); diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs index 8cfbf27f4e..b501baf513 100644 --- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs @@ -56,8 +56,8 @@ namespace SimpleApp for (int i = 0; i < 65536; i++) { - int x = i%256; - int y = i/256; + //int x = i%256; + //int y = i/256; map[i] = 25f; } diff --git a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs index c6428b8688..8e74b5ffd3 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs @@ -384,7 +384,6 @@ namespace OpenSim.Region.Physics.POSPlugin private PhysicsVector _size; private PhysicsVector m_rotationalVelocity = PhysicsVector.Zero; private Quaternion _orientation; - private bool flying; private bool iscolliding; public POSPrim() diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs index 4805d79a5d..8956f1a7ee 100644 --- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs +++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs @@ -345,7 +345,6 @@ namespace OpenSim.Region.Physics.PhysXPlugin public class PhysXPrim : PhysicsActor { - private PhysicsVector _position; private PhysicsVector _velocity; private PhysicsVector _acceleration; private PhysicsVector m_rotationalVelocity; @@ -354,7 +353,6 @@ namespace OpenSim.Region.Physics.PhysXPlugin public PhysXPrim(NxActor prim) { _velocity = new PhysicsVector(); - _position = new PhysicsVector(); _acceleration = new PhysicsVector(); _prim = prim; } @@ -437,76 +435,75 @@ namespace OpenSim.Region.Physics.PhysXPlugin } } - public override PhysicsVector Velocity - { - get - { - return _velocity; - } - set - { - _velocity = value; - } - } + public override PhysicsVector Velocity + { + get + { + return _velocity; + } + set + { + _velocity = value; + } + } - public override bool Kinematic - { - get - { - return this._prim.Kinematic; - } - set - { - this._prim.Kinematic = value; - } - } + public override bool Kinematic + { + get + { + return this._prim.Kinematic; + } + set + { + this._prim.Kinematic = value; + } + } - public override Quaternion Orientation - { - get - { - Quaternion res = new Quaternion(); - PhysXWrapper.Quaternion quat = this._prim.GetOrientation(); - res.w = quat.W; - res.x = quat.X; - res.y = quat.Y; - res.z = quat.Z; - return res; - } - set - { + public override Quaternion Orientation + { + get + { + Quaternion res = new Quaternion(); + PhysXWrapper.Quaternion quat = this._prim.GetOrientation(); + res.w = quat.W; + res.x = quat.X; + res.y = quat.Y; + res.z = quat.Z; + return res; + } + set + { - } - } + } + } - public override PhysicsVector Acceleration - { - get - { - return _acceleration; - } + public override PhysicsVector Acceleration + { + get + { + return _acceleration; + } - } - public void SetAcceleration (PhysicsVector accel) - { - this._acceleration = accel; - } + } + public void SetAcceleration (PhysicsVector accel) + { + this._acceleration = accel; + } - public override void AddForce(PhysicsVector force) - { + public override void AddForce(PhysicsVector force) + { - } + } - public override void SetMomentum(PhysicsVector momentum) - { + public override void SetMomentum(PhysicsVector momentum) + { - } + } public override PhysicsVector Size { get { return new PhysicsVector(0, 0, 0); } set { } } - } } diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Bitmap/Bitmap.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Bitmap/Bitmap.cs index 8b5fbed0da..c40229fd8f 100644 --- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Bitmap/Bitmap.cs +++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Bitmap/Bitmap.cs @@ -33,8 +33,6 @@ namespace libTerrain { internal class Raster { - private int w; - private int h; private Bitmap bmp; /// @@ -44,8 +42,6 @@ namespace libTerrain /// Height in pixels public Raster(int width, int height) { - w = width; - h = height; bmp = new Bitmap(width, height, PixelFormat.Format24bppRgb); } diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Voronoi.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Voronoi.cs index 0159b87e73..825d1753c4 100644 --- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Voronoi.cs +++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Voronoi.cs @@ -106,7 +106,6 @@ namespace libTerrain { SetDiff(); - Random generator = new Random(seed); int x, y, i; double[] distances = new double[points.Count];