diff options
author | Justin Clark-Casey (justincc) | 2010-08-26 16:27:41 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-08-26 16:27:41 +0100 |
commit | df702417dc6aba6422b3f252023ea551620f8ee2 (patch) | |
tree | 8baf1ddea3f747e4607aa1befb483add3248735f /OpenSim/Region/Framework | |
parent | Reinstate kill record check that prevents an entity update being sent to a cl... (diff) | |
download | opensim-SC-df702417dc6aba6422b3f252023ea551620f8ee2.zip opensim-SC-df702417dc6aba6422b3f252023ea551620f8ee2.tar.gz opensim-SC-df702417dc6aba6422b3f252023ea551620f8ee2.tar.bz2 opensim-SC-df702417dc6aba6422b3f252023ea551620f8ee2.tar.xz |
Remove mono compiler warnings
Diffstat (limited to 'OpenSim/Region/Framework')
7 files changed, 7 insertions, 36 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs index 505d01f..272f718 100644 --- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs +++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs | |||
@@ -31,7 +31,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
31 | 31 | ||
32 | public class Prioritizer | 32 | public class Prioritizer |
33 | { | 33 | { |
34 | private static readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 34 | // private static readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
35 | 35 | ||
36 | /// <summary> | 36 | /// <summary> |
37 | /// This is added to the priority of all child prims, to make sure that the root prim update is sent to the | 37 | /// This is added to the priority of all child prims, to make sure that the root prim update is sent to the |
@@ -75,7 +75,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
75 | break; | 75 | break; |
76 | default: | 76 | default: |
77 | throw new InvalidOperationException("UpdatePrioritizationScheme not defined."); | 77 | throw new InvalidOperationException("UpdatePrioritizationScheme not defined."); |
78 | break; | ||
79 | } | 78 | } |
80 | 79 | ||
81 | // Adjust priority so that root prims are sent to the viewer first. This is especially important for | 80 | // Adjust priority so that root prims are sent to the viewer first. This is especially important for |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 1f4d022..5fe944d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3608,18 +3608,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
3608 | return true; | 3608 | return true; |
3609 | } | 3609 | } |
3610 | 3610 | ||
3611 | private ILandObject GetParcelAtPoint(float x, float y) | ||
3612 | { | ||
3613 | foreach (var parcel in AllParcels()) | ||
3614 | { | ||
3615 | if (parcel.ContainsPoint((int)x,(int)y)) | ||
3616 | { | ||
3617 | return parcel; | ||
3618 | } | ||
3619 | } | ||
3620 | return null; | ||
3621 | } | ||
3622 | |||
3623 | /// <summary> | 3611 | /// <summary> |
3624 | /// Update an AgentCircuitData object with new information | 3612 | /// Update an AgentCircuitData object with new information |
3625 | /// </summary> | 3613 | /// </summary> |
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index c675322..88e084e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
70 | /// <summary> | 70 | /// <summary> |
71 | /// A user will arrive shortly, set up appropriate credentials so it can connect | 71 | /// A user will arrive shortly, set up appropriate credentials so it can connect |
72 | /// </summary> | 72 | /// </summary> |
73 | public event ExpectUserDelegate OnExpectUser; | 73 | // public event ExpectUserDelegate OnExpectUser; |
74 | 74 | ||
75 | /// <summary> | 75 | /// <summary> |
76 | /// A Prim will arrive shortly | 76 | /// A Prim will arrive shortly |
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
80 | /// <summary> | 80 | /// <summary> |
81 | /// A new prim has arrived | 81 | /// A new prim has arrived |
82 | /// </summary> | 82 | /// </summary> |
83 | public event PrimCrossing OnPrimCrossingIntoRegion; | 83 | // public event PrimCrossing OnPrimCrossingIntoRegion; |
84 | 84 | ||
85 | ///// <summary> | 85 | ///// <summary> |
86 | ///// A New Region is up and available | 86 | ///// A New Region is up and available |
@@ -90,7 +90,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
90 | /// <summary> | 90 | /// <summary> |
91 | /// We have a child agent for this avatar and we're getting a status update about it | 91 | /// We have a child agent for this avatar and we're getting a status update about it |
92 | /// </summary> | 92 | /// </summary> |
93 | public event ChildAgentUpdate OnChildAgentUpdate; | 93 | // public event ChildAgentUpdate OnChildAgentUpdate; |
94 | //public event RemoveKnownRegionsFromAvatarList OnRemoveKnownRegionFromAvatar; | 94 | //public event RemoveKnownRegionsFromAvatarList OnRemoveKnownRegionFromAvatar; |
95 | 95 | ||
96 | /// <summary> | 96 | /// <summary> |
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 1da4287..5b4ec3b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1700,8 +1700,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1700 | SceneObjectPart newRoot = newSet[0]; | 1700 | SceneObjectPart newRoot = newSet[0]; |
1701 | newSet.RemoveAt(0); | 1701 | newSet.RemoveAt(0); |
1702 | 1702 | ||
1703 | List<uint> linkIDs = new List<uint>(); | ||
1704 | |||
1705 | foreach (SceneObjectPart newChild in newSet) | 1703 | foreach (SceneObjectPart newChild in newSet) |
1706 | newChild.UpdateFlag = 0; | 1704 | newChild.UpdateFlag = 0; |
1707 | 1705 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 2ad4223..3ed74e1 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -4727,20 +4727,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
4727 | if (ParentGroup == null || ParentGroup.IsDeleted) | 4727 | if (ParentGroup == null || ParentGroup.IsDeleted) |
4728 | return; | 4728 | return; |
4729 | 4729 | ||
4730 | Vector3 lPos = OffsetPosition; | 4730 | if (IsAttachment && ParentGroup.RootPart != this) |
4731 | 4731 | return; | |
4732 | if (IsAttachment) | ||
4733 | { | ||
4734 | if (ParentGroup.RootPart != this) | ||
4735 | return; | ||
4736 | |||
4737 | lPos = ParentGroup.RootPart.AttachedPos; | ||
4738 | } | ||
4739 | else | ||
4740 | { | ||
4741 | if (ParentGroup.RootPart == this) | ||
4742 | lPos = AbsolutePosition; | ||
4743 | } | ||
4744 | 4732 | ||
4745 | // Causes this thread to dig into the Client Thread Data. | 4733 | // Causes this thread to dig into the Client Thread Data. |
4746 | // Remember your locking here! | 4734 | // Remember your locking here! |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index e08fa77..d7767bd 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -576,8 +576,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
576 | } | 576 | } |
577 | 577 | ||
578 | public SceneObjectGroup GetRezReadySceneObject(TaskInventoryItem item) | 578 | public SceneObjectGroup GetRezReadySceneObject(TaskInventoryItem item) |
579 | { | 579 | { |
580 | UUID ownerID = item.OwnerID; | ||
581 | AssetBase rezAsset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString()); | 580 | AssetBase rezAsset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString()); |
582 | 581 | ||
583 | if (null == rezAsset) | 582 | if (null == rezAsset) |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 08c6e27..a4eae42 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2327,7 +2327,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2327 | m_perfMonMS = Util.EnvironmentTickCount(); | 2327 | m_perfMonMS = Util.EnvironmentTickCount(); |
2328 | 2328 | ||
2329 | PhysicsActor actor = m_physicsActor; | 2329 | PhysicsActor actor = m_physicsActor; |
2330 | Vector3 velocity = (actor != null) ? actor.Velocity : Vector3.Zero; | ||
2331 | 2330 | ||
2332 | Vector3 pos = m_pos; | 2331 | Vector3 pos = m_pos; |
2333 | pos.Z += m_appearance.HipOffset; | 2332 | pos.Z += m_appearance.HipOffset; |