diff options
author | Jeff Ames | 2007-11-18 15:14:37 +0000 |
---|---|---|
committer | Jeff Ames | 2007-11-18 15:14:37 +0000 |
commit | 924026d01c1dd25218e9a4296eb27640091405f3 (patch) | |
tree | 7d9e8fcb28b0ce6090cc42c4754d5673bb2853c2 /OpenSim/Region | |
parent | first stab at implementation of CopyInventoryItem (diff) | |
download | opensim-SC_OLD-924026d01c1dd25218e9a4296eb27640091405f3.zip opensim-SC_OLD-924026d01c1dd25218e9a4296eb27640091405f3.tar.gz opensim-SC_OLD-924026d01c1dd25218e9a4296eb27640091405f3.tar.bz2 opensim-SC_OLD-924026d01c1dd25218e9a4296eb27640091405f3.tar.xz |
cleaned up some mono compiler warnings
Diffstat (limited to '')
12 files changed, 65 insertions, 77 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index 70a99f0..4aaa011 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs | |||
@@ -1382,7 +1382,7 @@ namespace OpenSim.Region.ClientStack | |||
1382 | pos.X = 100f; | 1382 | pos.X = 100f; |
1383 | objdata.ID = 8880000; | 1383 | objdata.ID = 8880000; |
1384 | objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0"); | 1384 | objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0"); |
1385 | LLVector3 pos2 = new LLVector3(100f, 100f, 23f); | 1385 | //LLVector3 pos2 = new LLVector3(100f, 100f, 23f); |
1386 | //objdata.FullID=user.AgentId; | 1386 | //objdata.FullID=user.AgentId; |
1387 | byte[] pb = pos.GetBytes(); | 1387 | byte[] pb = pos.GetBytes(); |
1388 | Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length); | 1388 | 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 d5edc6d..a78e4f6 100644 --- a/OpenSim/Region/Environment/Modules/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/ChatModule.cs | |||
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Environment.Modules | |||
67 | m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance); | 67 | m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance); |
68 | m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance); | 68 | m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance); |
69 | } | 69 | } |
70 | catch (Exception e) | 70 | catch (Exception) |
71 | { | 71 | { |
72 | } | 72 | } |
73 | 73 | ||
@@ -304,7 +304,7 @@ namespace OpenSim.Region.Environment.Modules | |||
304 | m_enabled = true; | 304 | m_enabled = true; |
305 | } | 305 | } |
306 | } | 306 | } |
307 | catch (Exception e) | 307 | catch (Exception) |
308 | { | 308 | { |
309 | Console.WriteLine("No IRC config information, skipping IRC bridge configuration"); | 309 | Console.WriteLine("No IRC config information, skipping IRC bridge configuration"); |
310 | } | 310 | } |
diff --git a/OpenSim/Region/Environment/Modules/SunModule.cs b/OpenSim/Region/Environment/Modules/SunModule.cs index 3598798..c941b1e 100644 --- a/OpenSim/Region/Environment/Modules/SunModule.cs +++ b/OpenSim/Region/Environment/Modules/SunModule.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Environment.Modules | |||
59 | try { | 59 | try { |
60 | m_day_length = config.Configs["Sun"].GetDouble("day_length", 0.5); | 60 | m_day_length = config.Configs["Sun"].GetDouble("day_length", 0.5); |
61 | m_frame_mod = config.Configs["Sun"].GetInt("frame_rate", 100); | 61 | m_frame_mod = config.Configs["Sun"].GetInt("frame_rate", 100); |
62 | } catch (Exception e) { | 62 | } catch (Exception) { |
63 | m_day_length = 0.5; | 63 | m_day_length = 0.5; |
64 | m_frame_mod = 100; | 64 | m_frame_mod = 100; |
65 | } | 65 | } |
diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs index 434c92f..1223f5c 100644 --- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs +++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs | |||
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Environment.Modules | |||
153 | } | 153 | } |
154 | } | 154 | } |
155 | 155 | ||
156 | if ((channel == null) || (channel.Equals(LLUUID.Zero))) | 156 | if ((channel.Equals(null)) || (channel.Equals(LLUUID.Zero))) |
157 | { | 157 | { |
158 | channel = LLUUID.Random(); | 158 | channel = LLUUID.Random(); |
159 | RPCChannelInfo rpcChanInfo = new RPCChannelInfo(localID, itemID, channel); | 159 | RPCChannelInfo rpcChanInfo = new RPCChannelInfo(localID, itemID, channel); |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 18fe785..76fe4b6 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -841,7 +841,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
841 | IsPhantom = (data[i++] != 0) ? true : false; | 841 | IsPhantom = (data[i++] != 0) ? true : false; |
842 | CastsShadows = (data[i++] != 0) ? true : false; | 842 | CastsShadows = (data[i++] != 0) ? true : false; |
843 | } | 843 | } |
844 | catch (Exception e) | 844 | catch (Exception) |
845 | { | 845 | { |
846 | Console.WriteLine("Ignoring invalid Packet:"); | 846 | Console.WriteLine("Ignoring invalid Packet:"); |
847 | //Silently ignore it - TODO: FIXME Quick | 847 | //Silently ignore it - TODO: FIXME Quick |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index b6daad6..38523e0 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -439,7 +439,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
439 | /// </summary> | 439 | /// </summary> |
440 | public void StopMovement() | 440 | public void StopMovement() |
441 | { | 441 | { |
442 | int x = 0; | ||
443 | } | 442 | } |
444 | 443 | ||
445 | public void AddNeighbourRegion(ulong regionHandle) | 444 | public void AddNeighbourRegion(ulong regionHandle) |
@@ -624,8 +623,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
624 | { | 623 | { |
625 | pos = part.AbsolutePosition + offset; | 624 | pos = part.AbsolutePosition + offset; |
626 | 625 | ||
627 | double dist = AbsolutePosition.GetDistanceTo(pos); | ||
628 | |||
629 | if (m_physicsActor != null) | 626 | if (m_physicsActor != null) |
630 | { | 627 | { |
631 | m_sitAvatarHeight = m_physicsActor.Size.Z; | 628 | m_sitAvatarHeight = m_physicsActor.Size.Z; |
@@ -633,7 +630,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
633 | 630 | ||
634 | // this doesn't seem to quite work yet.... | 631 | // this doesn't seem to quite work yet.... |
635 | // // if we're close, set the avatar position to the target position and forgo autopilot | 632 | // // if we're close, set the avatar position to the target position and forgo autopilot |
636 | // if (dist < 2.5) | 633 | // if (AbsolutePosition.GetDistanceTo(pos) < 2.5) |
637 | // { | 634 | // { |
638 | // autopilot = false; | 635 | // autopilot = false; |
639 | // AbsolutePosition = pos + new LLVector3(0.0f, 0.0f, m_sitAvatarHeight); | 636 | // 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 7b1420b..b3084a2 100644 --- a/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs +++ b/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs | |||
@@ -39,7 +39,7 @@ namespace SimpleApp | |||
39 | public FileSystemObject(Scene world, FileInfo fileInfo, LLVector3 pos) | 39 | public FileSystemObject(Scene world, FileInfo fileInfo, LLVector3 pos) |
40 | : base(world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, BoxShape.Default) | 40 | : base(world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, BoxShape.Default) |
41 | { | 41 | { |
42 | float size = (float) Math.Pow((double) fileInfo.Length, (double) 1/3)/5; | 42 | //float size = (float) Math.Pow((double) fileInfo.Length, (double) 1/3)/5; |
43 | // rootPrimitive.ResizeGoup(new LLVector3(size, size, size)); | 43 | // rootPrimitive.ResizeGoup(new LLVector3(size, size, size)); |
44 | Text = fileInfo.Name; | 44 | Text = fileInfo.Name; |
45 | ScheduleGroupForFullUpdate(); | 45 | ScheduleGroupForFullUpdate(); |
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs index 8cfbf27..b501baf 100644 --- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs | |||
@@ -56,8 +56,8 @@ namespace SimpleApp | |||
56 | 56 | ||
57 | for (int i = 0; i < 65536; i++) | 57 | for (int i = 0; i < 65536; i++) |
58 | { | 58 | { |
59 | int x = i%256; | 59 | //int x = i%256; |
60 | int y = i/256; | 60 | //int y = i/256; |
61 | 61 | ||
62 | map[i] = 25f; | 62 | map[i] = 25f; |
63 | } | 63 | } |
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs index c6428b8..8e74b5f 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs | |||
@@ -384,7 +384,6 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
384 | private PhysicsVector _size; | 384 | private PhysicsVector _size; |
385 | private PhysicsVector m_rotationalVelocity = PhysicsVector.Zero; | 385 | private PhysicsVector m_rotationalVelocity = PhysicsVector.Zero; |
386 | private Quaternion _orientation; | 386 | private Quaternion _orientation; |
387 | private bool flying; | ||
388 | private bool iscolliding; | 387 | private bool iscolliding; |
389 | 388 | ||
390 | public POSPrim() | 389 | public POSPrim() |
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs index 4805d79..8956f1a 100644 --- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs +++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | |||
@@ -345,7 +345,6 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
345 | 345 | ||
346 | public class PhysXPrim : PhysicsActor | 346 | public class PhysXPrim : PhysicsActor |
347 | { | 347 | { |
348 | private PhysicsVector _position; | ||
349 | private PhysicsVector _velocity; | 348 | private PhysicsVector _velocity; |
350 | private PhysicsVector _acceleration; | 349 | private PhysicsVector _acceleration; |
351 | private PhysicsVector m_rotationalVelocity; | 350 | private PhysicsVector m_rotationalVelocity; |
@@ -354,7 +353,6 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
354 | public PhysXPrim(NxActor prim) | 353 | public PhysXPrim(NxActor prim) |
355 | { | 354 | { |
356 | _velocity = new PhysicsVector(); | 355 | _velocity = new PhysicsVector(); |
357 | _position = new PhysicsVector(); | ||
358 | _acceleration = new PhysicsVector(); | 356 | _acceleration = new PhysicsVector(); |
359 | _prim = prim; | 357 | _prim = prim; |
360 | } | 358 | } |
@@ -437,76 +435,75 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
437 | } | 435 | } |
438 | } | 436 | } |
439 | 437 | ||
440 | public override PhysicsVector Velocity | 438 | public override PhysicsVector Velocity |
441 | { | 439 | { |
442 | get | 440 | get |
443 | { | 441 | { |
444 | return _velocity; | 442 | return _velocity; |
445 | } | 443 | } |
446 | set | 444 | set |
447 | { | 445 | { |
448 | _velocity = value; | 446 | _velocity = value; |
449 | } | 447 | } |
450 | } | 448 | } |
451 | 449 | ||
452 | public override bool Kinematic | 450 | public override bool Kinematic |
453 | { | 451 | { |
454 | get | 452 | get |
455 | { | 453 | { |
456 | return this._prim.Kinematic; | 454 | return this._prim.Kinematic; |
457 | } | 455 | } |
458 | set | 456 | set |
459 | { | 457 | { |
460 | this._prim.Kinematic = value; | 458 | this._prim.Kinematic = value; |
461 | } | 459 | } |
462 | } | 460 | } |
463 | 461 | ||
464 | public override Quaternion Orientation | 462 | public override Quaternion Orientation |
465 | { | 463 | { |
466 | get | 464 | get |
467 | { | 465 | { |
468 | Quaternion res = new Quaternion(); | 466 | Quaternion res = new Quaternion(); |
469 | PhysXWrapper.Quaternion quat = this._prim.GetOrientation(); | 467 | PhysXWrapper.Quaternion quat = this._prim.GetOrientation(); |
470 | res.w = quat.W; | 468 | res.w = quat.W; |
471 | res.x = quat.X; | 469 | res.x = quat.X; |
472 | res.y = quat.Y; | 470 | res.y = quat.Y; |
473 | res.z = quat.Z; | 471 | res.z = quat.Z; |
474 | return res; | 472 | return res; |
475 | } | 473 | } |
476 | set | 474 | set |
477 | { | 475 | { |
478 | 476 | ||
479 | } | 477 | } |
480 | } | 478 | } |
481 | 479 | ||
482 | public override PhysicsVector Acceleration | 480 | public override PhysicsVector Acceleration |
483 | { | 481 | { |
484 | get | 482 | get |
485 | { | 483 | { |
486 | return _acceleration; | 484 | return _acceleration; |
487 | } | 485 | } |
488 | 486 | ||
489 | } | 487 | } |
490 | public void SetAcceleration (PhysicsVector accel) | 488 | public void SetAcceleration (PhysicsVector accel) |
491 | { | 489 | { |
492 | this._acceleration = accel; | 490 | this._acceleration = accel; |
493 | } | 491 | } |
494 | 492 | ||
495 | public override void AddForce(PhysicsVector force) | 493 | public override void AddForce(PhysicsVector force) |
496 | { | 494 | { |
497 | 495 | ||
498 | } | 496 | } |
499 | 497 | ||
500 | public override void SetMomentum(PhysicsVector momentum) | 498 | public override void SetMomentum(PhysicsVector momentum) |
501 | { | 499 | { |
502 | 500 | ||
503 | } | 501 | } |
504 | 502 | ||
505 | public override PhysicsVector Size | 503 | public override PhysicsVector Size |
506 | { | 504 | { |
507 | get { return new PhysicsVector(0, 0, 0); } | 505 | get { return new PhysicsVector(0, 0, 0); } |
508 | set { } | 506 | set { } |
509 | } | 507 | } |
510 | |||
511 | } | 508 | } |
512 | } | 509 | } |
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Bitmap/Bitmap.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Bitmap/Bitmap.cs index 8b5fbed..c40229f 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 | |||
33 | { | 33 | { |
34 | internal class Raster | 34 | internal class Raster |
35 | { | 35 | { |
36 | private int w; | ||
37 | private int h; | ||
38 | private Bitmap bmp; | 36 | private Bitmap bmp; |
39 | 37 | ||
40 | /// <summary> | 38 | /// <summary> |
@@ -44,8 +42,6 @@ namespace libTerrain | |||
44 | /// <param name="height">Height in pixels</param> | 42 | /// <param name="height">Height in pixels</param> |
45 | public Raster(int width, int height) | 43 | public Raster(int width, int height) |
46 | { | 44 | { |
47 | w = width; | ||
48 | h = height; | ||
49 | bmp = new Bitmap(width, height, PixelFormat.Format24bppRgb); | 45 | bmp = new Bitmap(width, height, PixelFormat.Format24bppRgb); |
50 | } | 46 | } |
51 | 47 | ||
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Voronoi.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Generators/Voronoi.cs index 0159b87..825d175 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 | |||
106 | { | 106 | { |
107 | SetDiff(); | 107 | SetDiff(); |
108 | 108 | ||
109 | Random generator = new Random(seed); | ||
110 | int x, y, i; | 109 | int x, y, i; |
111 | double[] distances = new double[points.Count]; | 110 | double[] distances = new double[points.Count]; |
112 | 111 | ||