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

cleaned up some mono compiler warnings

afrisby
Jeff Ames 2007-11-18 15:14:37 +00:00
parent d10c79d421
commit 924026d01c
14 changed files with 68 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@ -115,7 +115,7 @@ namespace OpenSim.Framework.UserManagement
pickerlist = plugin.Value.GeneratePickerResults(queryID, query); pickerlist = plugin.Value.GeneratePickerResults(queryID, query);
} }
catch (Exception e) catch (Exception)
{ {
MainLog.Instance.Verbose("Unable to generate AgentPickerData via " + plugin.Key + "(" + query + ")"); MainLog.Instance.Verbose("Unable to generate AgentPickerData via " + plugin.Key + "(" + query + ")");
return new List<AvatarPickerAvatar>(); return new List<AvatarPickerAvatar>();
@ -326,7 +326,7 @@ namespace OpenSim.Framework.UserManagement
try try
{ {
string[] parts = startLoc.Remove(0, 4).Split('&'); string[] parts = startLoc.Remove(0, 4).Split('&');
string region = parts[0]; //string region = parts[0];
//////////////////////////////////////////////////// ////////////////////////////////////////////////////
//SimProfile SimInfo = new SimProfile(); //SimProfile SimInfo = new SimProfile();

2
OpenSim/Framework/RegionInfo.cs
View File

@ -301,7 +301,7 @@ namespace OpenSim.Framework
public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) 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; return true;
} }

2
OpenSim/Region/ClientStack/ClientView.API.cs
View File

@ -1382,7 +1382,7 @@ namespace OpenSim.Region.ClientStack
pos.X = 100f; pos.X = 100f;
objdata.ID = 8880000; objdata.ID = 8880000;
objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0"); 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; //objdata.FullID=user.AgentId;
byte[] pb = pos.GetBytes(); byte[] pb = pos.GetBytes();
Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length); Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length);

4
OpenSim/Region/Environment/Modules/ChatModule.cs
View File

@ -67,7 +67,7 @@ namespace OpenSim.Region.Environment.Modules
m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance); m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance);
m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance); 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; m_enabled = true;
} }
} }
catch (Exception e) catch (Exception)
{ {
Console.WriteLine("No IRC config information, skipping IRC bridge configuration"); Console.WriteLine("No IRC config information, skipping IRC bridge configuration");
} }

2
OpenSim/Region/Environment/Modules/SunModule.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Region.Environment.Modules
try { try {
m_day_length = config.Configs["Sun"].GetDouble("day_length", 0.5); m_day_length = config.Configs["Sun"].GetDouble("day_length", 0.5);
m_frame_mod = config.Configs["Sun"].GetInt("frame_rate", 100); m_frame_mod = config.Configs["Sun"].GetInt("frame_rate", 100);
} catch (Exception e) { } catch (Exception) {
m_day_length = 0.5; m_day_length = 0.5;
m_frame_mod = 100; m_frame_mod = 100;
} }

2
OpenSim/Region/Environment/Modules/XMLRPCModule.cs
View File

@ -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(); channel = LLUUID.Random();
RPCChannelInfo rpcChanInfo = new RPCChannelInfo(localID, itemID, channel); RPCChannelInfo rpcChanInfo = new RPCChannelInfo(localID, itemID, channel);

2
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -841,7 +841,7 @@ namespace OpenSim.Region.Environment.Scenes
IsPhantom = (data[i++] != 0) ? true : false; IsPhantom = (data[i++] != 0) ? true : false;
CastsShadows = (data[i++] != 0) ? true : false; CastsShadows = (data[i++] != 0) ? true : false;
} }
catch (Exception e) catch (Exception)
{ {
Console.WriteLine("Ignoring invalid Packet:"); Console.WriteLine("Ignoring invalid Packet:");
//Silently ignore it - TODO: FIXME Quick //Silently ignore it - TODO: FIXME Quick

5
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -439,7 +439,6 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary> /// </summary>
public void StopMovement() public void StopMovement()
{ {
int x = 0;
} }
public void AddNeighbourRegion(ulong regionHandle) public void AddNeighbourRegion(ulong regionHandle)
@ -624,8 +623,6 @@ namespace OpenSim.Region.Environment.Scenes
{ {
pos = part.AbsolutePosition + offset; pos = part.AbsolutePosition + offset;
double dist = AbsolutePosition.GetDistanceTo(pos);
if (m_physicsActor != null) if (m_physicsActor != null)
{ {
m_sitAvatarHeight = m_physicsActor.Size.Z; m_sitAvatarHeight = m_physicsActor.Size.Z;
@ -633,7 +630,7 @@ namespace OpenSim.Region.Environment.Scenes
// this doesn't seem to quite work yet.... // this doesn't seem to quite work yet....
// // if we're close, set the avatar position to the target position and forgo autopilot // // 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; // autopilot = false;
// AbsolutePosition = pos + new LLVector3(0.0f, 0.0f, m_sitAvatarHeight); // AbsolutePosition = pos + new LLVector3(0.0f, 0.0f, m_sitAvatarHeight);

2
OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs
View File

@ -39,7 +39,7 @@ namespace SimpleApp
public FileSystemObject(Scene world, FileInfo fileInfo, LLVector3 pos) public FileSystemObject(Scene world, FileInfo fileInfo, LLVector3 pos)
: base(world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, BoxShape.Default) : 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)); // rootPrimitive.ResizeGoup(new LLVector3(size, size, size));
Text = fileInfo.Name; Text = fileInfo.Name;
ScheduleGroupForFullUpdate(); ScheduleGroupForFullUpdate();

4
OpenSim/Region/Examples/SimpleApp/MyWorld.cs
View File

@ -56,8 +56,8 @@ namespace SimpleApp
for (int i = 0; i < 65536; i++) for (int i = 0; i < 65536; i++)
{ {
int x = i%256; //int x = i%256;
int y = i/256; //int y = i/256;
map[i] = 25f; map[i] = 25f;
} }

1
OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
View File

@ -384,7 +384,6 @@ namespace OpenSim.Region.Physics.POSPlugin
private PhysicsVector _size; private PhysicsVector _size;
private PhysicsVector m_rotationalVelocity = PhysicsVector.Zero; private PhysicsVector m_rotationalVelocity = PhysicsVector.Zero;
private Quaternion _orientation; private Quaternion _orientation;
private bool flying;
private bool iscolliding; private bool iscolliding;
public POSPrim() public POSPrim()

113
OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
View File

@ -345,7 +345,6 @@ namespace OpenSim.Region.Physics.PhysXPlugin
public class PhysXPrim : PhysicsActor public class PhysXPrim : PhysicsActor
{ {
private PhysicsVector _position;
private PhysicsVector _velocity; private PhysicsVector _velocity;
private PhysicsVector _acceleration; private PhysicsVector _acceleration;
private PhysicsVector m_rotationalVelocity; private PhysicsVector m_rotationalVelocity;
@ -354,7 +353,6 @@ namespace OpenSim.Region.Physics.PhysXPlugin
public PhysXPrim(NxActor prim) public PhysXPrim(NxActor prim)
{ {
_velocity = new PhysicsVector(); _velocity = new PhysicsVector();
_position = new PhysicsVector();
_acceleration = new PhysicsVector(); _acceleration = new PhysicsVector();
_prim = prim; _prim = prim;
} }
@ -437,76 +435,75 @@ namespace OpenSim.Region.Physics.PhysXPlugin
} }
} }
public override PhysicsVector Velocity public override PhysicsVector Velocity
{ {
get get
{ {
return _velocity; return _velocity;
} }
set set
{ {
_velocity = value; _velocity = value;
} }
} }
public override bool Kinematic public override bool Kinematic
{ {
get get
{ {
return this._prim.Kinematic; return this._prim.Kinematic;
} }
set set
{ {
this._prim.Kinematic = value; this._prim.Kinematic = value;
} }
} }
public override Quaternion Orientation public override Quaternion Orientation
{ {
get get
{ {
Quaternion res = new Quaternion(); Quaternion res = new Quaternion();
PhysXWrapper.Quaternion quat = this._prim.GetOrientation(); PhysXWrapper.Quaternion quat = this._prim.GetOrientation();
res.w = quat.W; res.w = quat.W;
res.x = quat.X; res.x = quat.X;
res.y = quat.Y; res.y = quat.Y;
res.z = quat.Z; res.z = quat.Z;
return res; return res;
} }
set set
{ {
} }
} }
public override PhysicsVector Acceleration public override PhysicsVector Acceleration
{ {
get get
{ {
return _acceleration; return _acceleration;
} }
} }
public void SetAcceleration (PhysicsVector accel) public void SetAcceleration (PhysicsVector accel)
{ {
this._acceleration = 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 public override PhysicsVector Size
{ {
get { return new PhysicsVector(0, 0, 0); } get { return new PhysicsVector(0, 0, 0); }
set { } set { }
} }
} }
} }

4
OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Bitmap/Bitmap.cs
View File

@ -33,8 +33,6 @@ namespace libTerrain
{ {
internal class Raster internal class Raster
{ {
private int w;
private int h;
private Bitmap bmp; private Bitmap bmp;
/// <summary> /// <summary>
@ -44,8 +42,6 @@ namespace libTerrain
/// <param name="height">Height in pixels</param> /// <param name="height">Height in pixels</param>
public Raster(int width, int height) public Raster(int width, int height)
{ {
w = width;
h = height;
bmp = new Bitmap(width, height, PixelFormat.Format24bppRgb); bmp = new Bitmap(width, height, PixelFormat.Format24bppRgb);
} }

1
OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Voronoi.cs
View File

@ -106,7 +106,6 @@ namespace libTerrain
{ {
SetDiff(); SetDiff();
Random generator = new Random(seed);
int x, y, i; int x, y, i;
double[] distances = new double[points.Count]; double[] distances = new double[points.Count];