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/Environment/Scenes | |
parent | first stab at implementation of CopyInventoryItem (diff) | |
download | opensim-SC-924026d01c1dd25218e9a4296eb27640091405f3.zip opensim-SC-924026d01c1dd25218e9a4296eb27640091405f3.tar.gz opensim-SC-924026d01c1dd25218e9a4296eb27640091405f3.tar.bz2 opensim-SC-924026d01c1dd25218e9a4296eb27640091405f3.tar.xz |
cleaned up some mono compiler warnings
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 5 |
2 files changed, 2 insertions, 5 deletions
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); |