* Removed 12 compiler warnings.
parent
e820159fb5
commit
be7ae3dd3e
|
@ -178,7 +178,6 @@ namespace OpenSim.Framework.UserManagement
|
||||||
{
|
{
|
||||||
m_loginMutex.ReleaseMutex();
|
m_loginMutex.ReleaseMutex();
|
||||||
}
|
}
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -244,7 +244,7 @@ namespace OpenSim.Framework.Console
|
||||||
Log.Flush();
|
Log.Flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
catch (FormatException FE)
|
catch (FormatException)
|
||||||
{
|
{
|
||||||
System.Console.WriteLine(args);
|
System.Console.WriteLine(args);
|
||||||
}
|
}
|
||||||
|
|
|
@ -118,7 +118,7 @@ namespace OpenSim.Grid.UserServer
|
||||||
XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
|
XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
|
||||||
XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
|
XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception)
|
||||||
{
|
{
|
||||||
tryDefault = true;
|
tryDefault = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -125,7 +125,7 @@ namespace OpenSim.Region.ClientStack
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
catch (System.ObjectDisposedException od)
|
catch (System.ObjectDisposedException)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -645,8 +645,6 @@ namespace OpenSim.Region.Communications.OGS1
|
||||||
MainLog.Instance.Debug(e.ToString());
|
MainLog.Instance.Debug(e.ToString());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
|
@ -857,7 +855,7 @@ namespace OpenSim.Region.Communications.OGS1
|
||||||
{
|
{
|
||||||
return m_localBackend.IncomingChildAgent(regionHandle, agentData);
|
return m_localBackend.IncomingChildAgent(regionHandle, agentData);
|
||||||
}
|
}
|
||||||
catch (RemotingException e)
|
catch (RemotingException)
|
||||||
{
|
{
|
||||||
//MainLog.Instance.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString());
|
//MainLog.Instance.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString());
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -165,7 +165,6 @@ namespace OpenSim.Region.Communications.OGS1
|
||||||
public LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)
|
public LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)
|
||||||
{
|
{
|
||||||
throw new Exception("The method or operation is not implemented.");
|
throw new Exception("The method or operation is not implemented.");
|
||||||
return LLUUID.Zero;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -292,7 +292,6 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
public EntityIntersection GetClosestIntersectingPrim(Ray hray)
|
public EntityIntersection GetClosestIntersectingPrim(Ray hray)
|
||||||
{
|
{
|
||||||
// Primitive Ray Tracing
|
// Primitive Ray Tracing
|
||||||
bool gothit = false;
|
|
||||||
float closestDistance = 280f;
|
float closestDistance = 280f;
|
||||||
EntityIntersection returnResult = new EntityIntersection();
|
EntityIntersection returnResult = new EntityIntersection();
|
||||||
foreach (EntityBase ent in Entities.Values)
|
foreach (EntityBase ent in Entities.Values)
|
||||||
|
@ -305,7 +304,6 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
{
|
{
|
||||||
if (result.distance < closestDistance)
|
if (result.distance < closestDistance)
|
||||||
{
|
{
|
||||||
gothit = true;
|
|
||||||
closestDistance = result.distance;
|
closestDistance = result.distance;
|
||||||
returnResult = result;
|
returnResult = result;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1068,7 +1068,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
{
|
{
|
||||||
avatar.Close();
|
avatar.Close();
|
||||||
}
|
}
|
||||||
catch (System.NullReferenceException NE)
|
catch (System.NullReferenceException)
|
||||||
{
|
{
|
||||||
//We can safely ignore null reference exceptions. It means the avatar are dead and cleaned up anyway.
|
//We can safely ignore null reference exceptions. It means the avatar are dead and cleaned up anyway.
|
||||||
|
|
||||||
|
|
|
@ -956,7 +956,6 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
|
|
||||||
public void UpdatePrimFlags(ushort type, bool inUse, byte[] data)
|
public void UpdatePrimFlags(ushort type, bool inUse, byte[] data)
|
||||||
{
|
{
|
||||||
bool hasPrim = false;
|
|
||||||
bool usePhysics = false;
|
bool usePhysics = false;
|
||||||
bool IsTemporary = false;
|
bool IsTemporary = false;
|
||||||
bool IsPhantom = false;
|
bool IsPhantom = false;
|
||||||
|
|
|
@ -54,7 +54,6 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
private uint m_requestedSitTargetID = 0;
|
private uint m_requestedSitTargetID = 0;
|
||||||
private LLVector3 m_requestedSitOffset = new LLVector3();
|
private LLVector3 m_requestedSitOffset = new LLVector3();
|
||||||
private float m_sitAvatarHeight = 2.0f;
|
private float m_sitAvatarHeight = 2.0f;
|
||||||
private bool m_oldColliding = true;
|
|
||||||
|
|
||||||
private bool m_isTyping = false;
|
private bool m_isTyping = false;
|
||||||
private bool m_setAlwaysRun = false;
|
private bool m_setAlwaysRun = false;
|
||||||
|
|
|
@ -222,7 +222,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
|
||||||
LSL_Types.Quaternion a1 = new LSL_Types.Quaternion(0.0, 0.0, cz, cw);
|
LSL_Types.Quaternion a1 = new LSL_Types.Quaternion(0.0, 0.0, cz, cw);
|
||||||
LSL_Types.Quaternion a2 = new LSL_Types.Quaternion(0.0, by, 0.0, bw);
|
LSL_Types.Quaternion a2 = new LSL_Types.Quaternion(0.0, by, 0.0, bw);
|
||||||
LSL_Types.Quaternion a3 = new LSL_Types.Quaternion(ax, 0.0, 0.0, aw);
|
LSL_Types.Quaternion a3 = new LSL_Types.Quaternion(ax, 0.0, 0.0, aw);
|
||||||
LSL_Types.Quaternion a = new LSL_Types.Quaternion();
|
|
||||||
//This multiplication doesnt compile, yet. a = a1 * a2 * a3;
|
//This multiplication doesnt compile, yet. a = a1 * a2 * a3;
|
||||||
LSL_Types.Quaternion b = new LSL_Types.Quaternion(ax*bw*cw + aw*by*cz,
|
LSL_Types.Quaternion b = new LSL_Types.Quaternion(ax*bw*cw + aw*by*cz,
|
||||||
aw*by*cw - ax*bw*cz, aw*bw*cz + ax*by*cw,
|
aw*by*cw - ax*bw*cz, aw*bw*cz + ax*by*cw,
|
||||||
|
|
Loading…
Reference in New Issue