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

* minor: remove warnings

0.6.0-stable
Justin Clarke Casey 2008-09-26 15:28:14 +00:00
parent 4b78aa50e6
commit 97323345ee
10 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
View File

@ -343,7 +343,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
Rest.Log.DebugFormat("{0} POST ENTRY", MsgId);
AvatarAppearance old = Rest.AvatarServices.GetUserAppearance(rdata.userProfile.ID);
//AvatarAppearance old = Rest.AvatarServices.GetUserAppearance(rdata.userProfile.ID);
rdata.userAppearance = new AvatarAppearance();
@ -749,7 +749,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
rdata.writer.WriteStartElement("Appearance");
rdata.writer.WriteAttributeString("Height", rdata.userAppearance.AvatarHeight.ToString());
if (rdata.userAppearance.Owner != null)
if (!rdata.userAppearance.Owner.Equals(null))
rdata.writer.WriteAttributeString("Owner", rdata.userAppearance.Owner.ToString());
rdata.writer.WriteAttributeString("Serial", rdata.userAppearance.Serial.ToString());

2
OpenSim/Data/Tests/BasicAssetTest.cs
View File

@ -50,7 +50,7 @@ namespace OpenSim.Data.Tests
{
log4net.Config.XmlConfigurator.Configure();
}
catch (Exception e)
catch (Exception)
{
// I don't care, just leave log4net off
}

2
OpenSim/Data/Tests/BasicInventoryTest.cs
View File

@ -69,7 +69,7 @@ namespace OpenSim.Data.Tests
{
log4net.Config.XmlConfigurator.Configure();
}
catch (Exception e)
catch (Exception)
{
// I don't care, just leave log4net off
}

2
OpenSim/Data/Tests/BasicRegionTest.cs
View File

@ -51,7 +51,7 @@ namespace OpenSim.Data.Tests
{
log4net.Config.XmlConfigurator.Configure();
}
catch (Exception e)
catch (Exception)
{
// I don't care, just leave log4net off
}

2
OpenSim/Data/Tests/BasicUserTest.cs
View File

@ -49,7 +49,7 @@ namespace OpenSim.Data.Tests
{
log4net.Config.XmlConfigurator.Configure();
}
catch (Exception e)
catch (Exception)
{
// I don't care, just leave log4net off
}

6
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -1242,8 +1242,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// Send terrain layer information to the client.
/// </summary>
/// <param name="o"></param>
private void DoSendWindData(object o)
{
//private void DoSendWindData(object o)
//{
//float[] map = (float[])o;
//try
@ -1268,7 +1268,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//{
// m_log.Warn("[CLIENT]: ClientView.API.cs: SendLayerData() - Failed with exception " + e.ToString());
// }
}
//}
/// <summary>
/// Sends a set of four patches (x, x+1, ..., x+3) to the client

8
OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
View File

@ -26,8 +26,8 @@
*/
using System.Collections.Generic;
using System.Reflection;
using log4net;
//using System.Reflection;
//using log4net;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Environment.Scenes;
@ -37,8 +37,8 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
{
public class AgentAssetTransactionsManager
{
private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
//private static readonly ILog m_log
// = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// Each agent has its own singleton collection of transactions

4
OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs
View File

@ -55,7 +55,6 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
private IClientAPI ourClient;
private UUID TransactionID = UUID.Zero;
private sbyte type = 0;
private bool UploadComplete;
private byte wearableType = 0;
public ulong XferID;
@ -140,15 +139,12 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
protected void RequestStartXfer()
{
UploadComplete = false;
XferID = Util.GetNextXferID();
ourClient.SendXferRequest(XferID, m_asset.Type, m_asset.FullID, 0, new byte[0]);
}
protected void SendCompleteMessage()
{
UploadComplete = true;
ourClient.SendAssetUploadCompleteMessage(m_asset.Type, true, m_asset.FullID);
m_finished = true;

8
OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs
View File

@ -140,10 +140,10 @@ namespace OpenSim.Region.Environment.Modules
//m_log.Debug("[WIND]:Regenerating...");
GenWindPos(); // Generate shared values once
int spotxp = 0;
int spotyp = 0;
int spotxm = 0;
int spotym = 0;
//int spotxp = 0;
//int spotyp = 0;
//int spotxm = 0;
//int spotym = 0;
List<ScenePresence> avatars = m_scene.GetAvatars();
foreach (ScenePresence avatar in avatars)
{

2
OpenSim/Region/ScriptEngine/Common/ScriptBaseClass.cs
View File

@ -72,7 +72,7 @@ namespace OpenSim.Region.ScriptEngine.Common
private Executor m_Exec;
private string m_state = "default";
//private string m_state = "default";
public void state(string newState)
{