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

minor: remove some mono compiler warnings

0.6.8-post-fixes
Justin Clark-Casey (justincc) 2009-11-04 19:44:28 +00:00
parent 535f4597c1
commit 9dd5d63495
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
View File

@ -77,13 +77,13 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
#region Internal functions #region Internal functions
private string UserAssetURL(UUID userID) // private string UserAssetURL(UUID userID)
{ // {
CachedUserInfo uinfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(userID); // CachedUserInfo uinfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(userID);
if (uinfo != null) // if (uinfo != null)
return (uinfo.UserProfile.UserAssetURI == "") ? null : uinfo.UserProfile.UserAssetURI; // return (uinfo.UserProfile.UserAssetURI == "") ? null : uinfo.UserProfile.UserAssetURI;
return null; // return null;
} // }
// private string UserInventoryURL(UUID userID) // private string UserInventoryURL(UUID userID)
// { // {

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

@ -1043,7 +1043,7 @@ namespace OpenSim.Region.Framework.Scenes
TimeSpan SinceLastFrame = DateTime.UtcNow - m_lastupdate; TimeSpan SinceLastFrame = DateTime.UtcNow - m_lastupdate;
physicsFPS = 0f; physicsFPS = 0f;
maintc = maintc = otherMS = Environment.TickCount; maintc = otherMS = Environment.TickCount;
int tmpFrameMS = maintc; int tmpFrameMS = maintc;
// Increment the frame counter // Increment the frame counter

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

@ -76,7 +76,7 @@ namespace OpenSim.Region.Framework.Scenes
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static readonly byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 }; private static readonly byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 };
private static readonly byte[] DEFAULT_TEXTURE = AvatarAppearance.GetDefaultTexture().GetBytes(); // private static readonly byte[] DEFAULT_TEXTURE = AvatarAppearance.GetDefaultTexture().GetBytes();
private static readonly Array DIR_CONTROL_FLAGS = Enum.GetValues(typeof(Dir_ControlFlags)); private static readonly Array DIR_CONTROL_FLAGS = Enum.GetValues(typeof(Dir_ControlFlags));
private static readonly Vector3 HEAD_ADJUSTMENT = new Vector3(0f, 0f, 0.3f); private static readonly Vector3 HEAD_ADJUSTMENT = new Vector3(0f, 0f, 0.3f);
/// <summary> /// <summary>
@ -181,7 +181,7 @@ namespace OpenSim.Region.Framework.Scenes
private byte m_state; private byte m_state;
//Reuse the Vector3 instead of creating a new one on the UpdateMovement method //Reuse the Vector3 instead of creating a new one on the UpdateMovement method
private Vector3 movementvector; // private Vector3 movementvector;
private bool m_autopilotMoving; private bool m_autopilotMoving;
private Vector3 m_autoPilotTarget; private Vector3 m_autoPilotTarget;
@ -2068,7 +2068,7 @@ namespace OpenSim.Region.Framework.Scenes
if (heldDown) { move.Z -= 1; } if (heldDown) { move.Z -= 1; }
// Is the avatar trying to move? // Is the avatar trying to move?
bool moving = (move != Vector3.Zero); // bool moving = (move != Vector3.Zero);
bool jumping = m_animTickJump != 0; bool jumping = m_animTickJump != 0;
#endregion Inputs #endregion Inputs
@ -2320,7 +2320,7 @@ namespace OpenSim.Region.Framework.Scenes
if (m_isChildAgent == false) if (m_isChildAgent == false)
{ {
PhysicsActor actor = m_physicsActor; // PhysicsActor actor = m_physicsActor;
// NOTE: Velocity is not the same as m_velocity. Velocity will attempt to // NOTE: Velocity is not the same as m_velocity. Velocity will attempt to
// grab the latest PhysicsActor velocity, whereas m_velocity is often // grab the latest PhysicsActor velocity, whereas m_velocity is often
@ -3256,7 +3256,7 @@ namespace OpenSim.Region.Framework.Scenes
Vector3 force = m_forceToApply.Value; Vector3 force = m_forceToApply.Value;
m_updateflag = true; m_updateflag = true;
movementvector = force; // movementvector = force;
Velocity = force; Velocity = force;
m_forceToApply = null; m_forceToApply = null;