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

Remove mono compiler warnings

prebuild-update
Justin Clark-Casey (justincc) 2010-08-26 16:27:41 +01:00
parent d99c60164d
commit df702417dc
7 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Framework/Scenes/Prioritizer.cs
View File

@ -31,7 +31,7 @@ namespace OpenSim.Region.Framework.Scenes
public class Prioritizer public class Prioritizer
{ {
private static readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); // private static readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
/// <summary> /// <summary>
/// This is added to the priority of all child prims, to make sure that the root prim update is sent to the /// 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
break; break;
default: default:
throw new InvalidOperationException("UpdatePrioritizationScheme not defined."); throw new InvalidOperationException("UpdatePrioritizationScheme not defined.");
break;
} }
// Adjust priority so that root prims are sent to the viewer first. This is especially important for // Adjust priority so that root prims are sent to the viewer first. This is especially important for

12
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -3608,18 +3608,6 @@ namespace OpenSim.Region.Framework.Scenes
return true; return true;
} }
private ILandObject GetParcelAtPoint(float x, float y)
{
foreach (var parcel in AllParcels())
{
if (parcel.ContainsPoint((int)x,(int)y))
{
return parcel;
}
}
return null;
}
/// <summary> /// <summary>
/// Update an AgentCircuitData object with new information /// Update an AgentCircuitData object with new information
/// </summary> /// </summary>

6
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
View File

@ -70,7 +70,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <summary> /// <summary>
/// A user will arrive shortly, set up appropriate credentials so it can connect /// A user will arrive shortly, set up appropriate credentials so it can connect
/// </summary> /// </summary>
public event ExpectUserDelegate OnExpectUser; // public event ExpectUserDelegate OnExpectUser;
/// <summary> /// <summary>
/// A Prim will arrive shortly /// A Prim will arrive shortly
@ -80,7 +80,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <summary> /// <summary>
/// A new prim has arrived /// A new prim has arrived
/// </summary> /// </summary>
public event PrimCrossing OnPrimCrossingIntoRegion; // public event PrimCrossing OnPrimCrossingIntoRegion;
///// <summary> ///// <summary>
///// A New Region is up and available ///// A New Region is up and available
@ -90,7 +90,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <summary> /// <summary>
/// We have a child agent for this avatar and we're getting a status update about it /// We have a child agent for this avatar and we're getting a status update about it
/// </summary> /// </summary>
public event ChildAgentUpdate OnChildAgentUpdate; // public event ChildAgentUpdate OnChildAgentUpdate;
//public event RemoveKnownRegionsFromAvatarList OnRemoveKnownRegionFromAvatar; //public event RemoveKnownRegionsFromAvatarList OnRemoveKnownRegionFromAvatar;
/// <summary> /// <summary>

2
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -1700,8 +1700,6 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectPart newRoot = newSet[0]; SceneObjectPart newRoot = newSet[0];
newSet.RemoveAt(0); newSet.RemoveAt(0);
List<uint> linkIDs = new List<uint>();
foreach (SceneObjectPart newChild in newSet) foreach (SceneObjectPart newChild in newSet)
newChild.UpdateFlag = 0; newChild.UpdateFlag = 0;

16
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -4727,20 +4727,8 @@ namespace OpenSim.Region.Framework.Scenes
if (ParentGroup == null || ParentGroup.IsDeleted) if (ParentGroup == null || ParentGroup.IsDeleted)
return; return;
Vector3 lPos = OffsetPosition; if (IsAttachment && ParentGroup.RootPart != this)
return;
if (IsAttachment)
{
if (ParentGroup.RootPart != this)
return;
lPos = ParentGroup.RootPart.AttachedPos;
}
else
{
if (ParentGroup.RootPart == this)
lPos = AbsolutePosition;
}
// Causes this thread to dig into the Client Thread Data. // Causes this thread to dig into the Client Thread Data.
// Remember your locking here! // Remember your locking here!

3
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@ -576,8 +576,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
public SceneObjectGroup GetRezReadySceneObject(TaskInventoryItem item) public SceneObjectGroup GetRezReadySceneObject(TaskInventoryItem item)
{ {
UUID ownerID = item.OwnerID;
AssetBase rezAsset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString()); AssetBase rezAsset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString());
if (null == rezAsset) if (null == rezAsset)

1
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -2327,7 +2327,6 @@ namespace OpenSim.Region.Framework.Scenes
m_perfMonMS = Util.EnvironmentTickCount(); m_perfMonMS = Util.EnvironmentTickCount();
PhysicsActor actor = m_physicsActor; PhysicsActor actor = m_physicsActor;
Vector3 velocity = (actor != null) ? actor.Velocity : Vector3.Zero;
Vector3 pos = m_pos; Vector3 pos = m_pos;
pos.Z += m_appearance.HipOffset; pos.Z += m_appearance.HipOffset;