From 998d7009a65def0a4debc9369d35b63611db5b55 Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Tue, 22 Apr 2014 20:04:12 +0300 Subject: Eliminated many warnings --- OpenSim/Data/MSSQL/MSSQLFriendsData.cs | 4 ++-- OpenSim/Data/MySQL/MySQLFriendsData.cs | 2 +- OpenSim/Data/MySQL/MySQLXAssetData.cs | 2 +- OpenSim/Data/PGSQL/PGSQLFriendsData.cs | 2 +- OpenSim/Data/SQLite/SQLiteFriendsData.cs | 2 +- OpenSim/Data/SQLite/SQLiteSimulationData.cs | 4 ++-- OpenSim/Data/SQLite/SQLiteUserProfilesData.cs | 1 - OpenSim/Framework/Animation.cs | 5 +++++ OpenSim/Framework/Console/MockConsole.cs | 2 ++ OpenSim/Framework/Tests/UtilTest.cs | 2 +- .../Region/ClientStack/Linden/UDP/LLClientView.cs | 25 ++++++++++++---------- .../Avatar/BakedTextures/XBakesModule.cs | 2 +- .../Avatar/InstantMessage/PresenceModule.cs | 2 ++ .../EntityTransfer/EntityTransferModule.cs | 2 -- .../EntityTransfer/HGEntityTransferModule.cs | 2 +- .../UserManagement/UserManagementModule.cs | 2 -- .../CoreModules/World/Land/LandManagementModule.cs | 2 -- .../Region/CoreModules/World/Land/LandObject.cs | 2 +- .../CoreModules/World/LegacyMap/MapImageModule.cs | 2 +- .../CoreModules/World/Terrain/TerrainModule.cs | 5 ++++- .../World/Warp3DMap/Warp3DImageModule.cs | 3 +++ .../Framework/Scenes/Animation/AnimationSet.cs | 5 +++++ OpenSim/Region/Framework/Scenes/SceneBase.cs | 3 +++ OpenSim/Region/Framework/Scenes/ScenePresence.cs | 1 - .../Region/Framework/Scenes/TerrainCompressor.cs | 3 +++ OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 2 +- .../Server/IRCClientView.cs | 2 ++ .../Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 2 +- .../Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | 4 ++-- .../Scripting/JsonStore/JsonStore.cs | 2 +- .../Scripting/JsonStore/JsonStoreModule.cs | 4 +--- .../World/MoneyModule/SampleMoneyModule.cs | 2 ++ .../BasicPhysicsPlugin/BasicPhysicsActor.cs | 2 -- OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | 1 - OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 4 ++++ .../Physics/BulletSPlugin/BSLinksetCompound.cs | 2 ++ .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 2 ++ OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 2 +- .../Physics/BulletSPlugin/BSShapeCollection.cs | 2 ++ OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 15 ++++++++++++- .../Shared/Api/Implementation/LSL_Api.cs | 4 ++-- OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 21 ------------------ .../Server/Handlers/Grid/GridServerPostHandler.cs | 3 +++ .../Handlers/Profiles/UserProfilesConnector.cs | 5 ----- OpenSim/Services/Interfaces/IGridService.cs | 3 +++ OpenSim/Services/LLLoginService/LLLoginService.cs | 2 +- .../UserProfilesService/UserProfilesService.cs | 1 - OpenSim/Tests/Common/Mock/MockScriptEngine.cs | 4 +++- 48 files changed, 101 insertions(+), 77 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs b/OpenSim/Data/MSSQL/MSSQLFriendsData.cs index fef6978..1af2dce 100644 --- a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs +++ b/OpenSim/Data/MSSQL/MSSQLFriendsData.cs @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) Contributors, http://opensimulator.org/ * See CONTRIBUTORS.TXT for a full list of copyright holders. * @@ -55,7 +55,7 @@ namespace OpenSim.Data.MSSQL return Delete(principalID.ToString(), friend); } - public bool Delete(string principalID, string friend) + public override bool Delete(string principalID, string friend) { using (SqlConnection conn = new SqlConnection(m_ConnectionString)) using (SqlCommand cmd = new SqlCommand()) diff --git a/OpenSim/Data/MySQL/MySQLFriendsData.cs b/OpenSim/Data/MySQL/MySQLFriendsData.cs index 3cd6b8f..6ba9fbd 100644 --- a/OpenSim/Data/MySQL/MySQLFriendsData.cs +++ b/OpenSim/Data/MySQL/MySQLFriendsData.cs @@ -47,7 +47,7 @@ namespace OpenSim.Data.MySQL return Delete(principalID.ToString(), friend); } - public bool Delete(string principalID, string friend) + public override bool Delete(string principalID, string friend) { using (MySqlCommand cmd = new MySqlCommand()) { diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs index 430bb9f..8361da2 100644 --- a/OpenSim/Data/MySQL/MySQLXAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs @@ -346,7 +346,7 @@ namespace OpenSim.Data.MySQL cmd.ExecuteNonQuery(); } } - catch (Exception e) + catch (Exception) { m_log.ErrorFormat( "[XASSET MYSQL DB]: Failure updating access_time for asset {0} with name {1}", diff --git a/OpenSim/Data/PGSQL/PGSQLFriendsData.cs b/OpenSim/Data/PGSQL/PGSQLFriendsData.cs index 4c1ee02..a841353 100644 --- a/OpenSim/Data/PGSQL/PGSQLFriendsData.cs +++ b/OpenSim/Data/PGSQL/PGSQLFriendsData.cs @@ -51,7 +51,7 @@ namespace OpenSim.Data.PGSQL } - public bool Delete(string principalID, string friend) + public override bool Delete(string principalID, string friend) { UUID princUUID = UUID.Zero; diff --git a/OpenSim/Data/SQLite/SQLiteFriendsData.cs b/OpenSim/Data/SQLite/SQLiteFriendsData.cs index cab85eb..331f426 100644 --- a/OpenSim/Data/SQLite/SQLiteFriendsData.cs +++ b/OpenSim/Data/SQLite/SQLiteFriendsData.cs @@ -67,7 +67,7 @@ namespace OpenSim.Data.SQLite return Delete(principalID.ToString(), friend); } - public bool Delete(string principalID, string friend) + public override bool Delete(string principalID, string friend) { using (SqliteCommand cmd = new SqliteCommand()) { diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 9466e99..a12004e 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs @@ -1605,7 +1605,7 @@ namespace OpenSim.Data.SQLite prim.SitName = (String)row["SitName"]; prim.TouchName = (String)row["TouchName"]; // permissions - prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]); + prim.Flags = (PrimFlags)Convert.ToUInt32(row["ObjectFlags"]); prim.CreatorIdentification = (String)row["CreatorID"]; prim.OwnerID = new UUID((String)row["OwnerID"]); prim.GroupID = new UUID((String)row["GroupID"]); @@ -2034,7 +2034,7 @@ namespace OpenSim.Data.SQLite row["SitName"] = prim.SitName; row["TouchName"] = prim.TouchName; // permissions - row["ObjectFlags"] = prim.ObjectFlags; + row["ObjectFlags"] = (uint)prim.Flags; row["CreatorID"] = prim.CreatorIdentification.ToString(); row["OwnerID"] = prim.OwnerID.ToString(); row["GroupID"] = prim.GroupID.ToString(); diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs index 90d45e9..0f5b4c8 100644 --- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs +++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs @@ -50,7 +50,6 @@ namespace OpenSim.Data.SQLite private SqliteConnection m_connection; private string m_connectionString; - private FieldInfo[] m_Fields; private Dictionary m_FieldMap = new Dictionary(); diff --git a/OpenSim/Framework/Animation.cs b/OpenSim/Framework/Animation.cs index 3425505..e958b75 100644 --- a/OpenSim/Framework/Animation.cs +++ b/OpenSim/Framework/Animation.cs @@ -132,6 +132,11 @@ namespace OpenSim.Framework return base.Equals(obj); } + public override int GetHashCode() + { + return base.GetHashCode(); + } + public override string ToString() { return "AnimID=" + AnimID.ToString() diff --git a/OpenSim/Framework/Console/MockConsole.cs b/OpenSim/Framework/Console/MockConsole.cs index 8ba58e4..18a48bd 100644 --- a/OpenSim/Framework/Console/MockConsole.cs +++ b/OpenSim/Framework/Console/MockConsole.cs @@ -40,7 +40,9 @@ namespace OpenSim.Framework.Console /// public class MockConsole : ICommandConsole { +#pragma warning disable 0067 public event OnOutputDelegate OnOutput; +#pragma warning restore 0067 private MockCommands m_commands = new MockCommands(); diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs index 3b7f252..960f5d8 100644 --- a/OpenSim/Framework/Tests/UtilTest.cs +++ b/OpenSim/Framework/Tests/UtilTest.cs @@ -299,7 +299,7 @@ namespace OpenSim.Framework.Tests uint z1 = 22; ulong regionHandle2; uint x2, y2, z2; - UUID fakeParcelID1, fakeParcelID2, uuid; + UUID fakeParcelID1, uuid; ulong bigInt64 = Util.BytesToUInt64Big(hexBytes8); Assert.AreEqual(var64Bit, bigInt64, diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index c905f20..3ab837d 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -71,7 +71,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP #region Events - public event GenericMessage OnGenericMessage; public event BinaryGenericMessage OnBinaryGenericMessage; public event Action OnLogout; public event ObjectPermissions OnObjectPermissions; @@ -79,13 +78,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP public event ViewerEffectEventHandler OnViewerEffect; public event ImprovedInstantMessage OnInstantMessage; public event ChatMessage OnChatFromClient; - public event TextureRequest OnRequestTexture; public event RezObject OnRezObject; public event DeRezObject OnDeRezObject; public event ModifyTerrain OnModifyTerrain; public event Action OnRegionHandShakeReply; public event GenericCall1 OnRequestWearables; - public event CachedTextureRequest OnCachedTextureRequest; public event SetAppearance OnSetAppearance; public event AvatarNowWearing OnAvatarNowWearing; public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; @@ -138,15 +135,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation; public event UpdateVector OnUpdatePrimScale; public event UpdateVector OnUpdatePrimGroupScale; - public event StatusChange OnChildAgentStatus; - public event GenericCall2 OnStopMovement; - public event Action OnRemoveAvatar; public event RequestMapBlocks OnRequestMapBlocks; public event RequestMapName OnMapNameRequest; public event TeleportLocationRequest OnTeleportLocationRequest; public event TeleportLandmarkRequest OnTeleportLandmarkRequest; public event TeleportCancel OnTeleportCancel; - public event DisconnectUser OnDisconnectUser; public event RequestAvatarProperties OnRequestAvatarProperties; public event SetAlwaysRun OnSetAlwaysRun; public event FetchInventory OnAgentDataUpdateRequest; @@ -176,7 +169,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP public event UpdateTaskInventory OnUpdateTaskInventory; public event MoveTaskInventory OnMoveTaskItem; public event RemoveTaskInventory OnRemoveTaskItem; - public event RequestAsset OnRequestAsset; public event UUIDNameRequest OnNameFromUUIDRequest; public event ParcelAccessListRequest OnParcelAccessListRequest; public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest; @@ -207,7 +199,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP public event RequestPayPrice OnRequestPayPrice; public event ObjectSaleInfo OnObjectSaleInfo; public event ObjectBuy OnObjectBuy; - public event BuyObjectInventory OnBuyObjectInventory; public event AgentSit OnUndo; public event AgentSit OnRedo; public event LandUndo OnLandUndo; @@ -216,7 +207,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP public event RequestObjectPropertiesFamily OnObjectGroupRequest; public event DetailedEstateDataRequest OnDetailedEstateDataRequest; public event SetEstateFlagsRequest OnSetEstateFlagsRequest; - public event SetEstateTerrainBaseTexture OnSetEstateTerrainBaseTexture; public event SetEstateTerrainDetailTexture OnSetEstateTerrainDetailTexture; public event SetEstateTerrainTextureHeights OnSetEstateTerrainTextureHeights; public event CommitEstateTerrainTextureRequest OnCommitEstateTerrainTextureRequest; @@ -239,7 +229,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP public event GetScriptRunning OnGetScriptRunning; public event SetScriptRunning OnSetScriptRunning; public event Action OnAutoPilotGo; - public event TerrainUnacked OnUnackedTerrain; public event ActivateGesture OnActivateGesture; public event DeactivateGesture OnDeactivateGesture; public event ObjectOwner OnObjectOwner; @@ -297,6 +286,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP public event GodlikeMessage onGodlikeMessage; public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; +#pragma warning disable 0067 + public event GenericMessage OnGenericMessage; + public event TextureRequest OnRequestTexture; + public event StatusChange OnChildAgentStatus; + public event GenericCall2 OnStopMovement; + public event Action OnRemoveAvatar; + public event DisconnectUser OnDisconnectUser; + public event RequestAsset OnRequestAsset; + public event BuyObjectInventory OnBuyObjectInventory; + public event SetEstateTerrainBaseTexture OnSetEstateTerrainBaseTexture; + public event TerrainUnacked OnUnackedTerrain; + public event CachedTextureRequest OnCachedTextureRequest; +#pragma warning restore 0067 + #endregion Events #region Class Members diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs index 6ff991e..af8a0c1 100644 --- a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs @@ -140,7 +140,7 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures return ret.ToArray(); } - catch (XmlException e) + catch (XmlException) { return null; } diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs index 4c678c2..c2440d8 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs @@ -49,8 +49,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage private static readonly ILog m_log = LogManager.GetLogger( MethodBase.GetCurrentMethod().DeclaringType); +#pragma warning disable 0067 public event PresenceChange OnPresenceChange; public event BulkPresenceData OnBulkPresenceData; +#pragma warning restore 0067 protected List m_Scenes = new List(); diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index d4b2f2d..539367d 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs @@ -1540,8 +1540,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer public bool Cross(ScenePresence agent, bool isFlying) { - uint x; - uint y; Vector3 newpos; string version; string failureReason; diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index 0becfb2..a3cebe9 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs @@ -426,7 +426,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer // return base.UpdateAgent(reg, finalDestination, agentData, sp); //} - public virtual void TriggerTeleportHome(UUID id, IClientAPI client) + public override void TriggerTeleportHome(UUID id, IClientAPI client) { TeleportHome(id, client); } diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 3455e2c..6a997b3 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs @@ -686,8 +686,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement if (!ConsoleUtil.TryParseConsoleUuid(MainConsole.Instance, cmd[2], out userId)) return; - string[] names; - UserData ud; lock (m_UserCache) diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 5ab97ff..fa5bfd6 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs @@ -848,8 +848,6 @@ namespace OpenSim.Region.CoreModules.World.Land /// private ILandObject GetLandObject(int x, int y, bool returnNullIfLandObjectOutsideBounds) { - ILandObject ret = null; - if (x >= m_scene.RegionInfo.RegionSizeX || y >= m_scene.RegionInfo.RegionSizeY || x < 0 || y < 0) { // These exceptions here will cause a lot of complaints from the users specifically because diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 57fa4d9..b1cfc81 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs @@ -927,7 +927,7 @@ namespace OpenSim.Region.CoreModules.World.Land { tempConvertMap[x, y] = bit; } - catch (Exception e) + catch (Exception) { m_log.DebugFormat("{0} ConvertBytestoLandBitmap: i={1}, x={2}, y={3}", LogHeader, i, x, y); } diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs index b00620e..796a15f 100644 --- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs +++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs @@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap { mapbmp = new Bitmap(m_scene.RegionInfo.MaptileStaticFile); } - catch (Exception e) + catch (Exception) { m_log.ErrorFormat( "[MAPTILE]: Failed to load Static map image texture file: {0} for {1}", diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index 3fda67f..56ceffd 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs @@ -74,8 +74,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain #endregion private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + +#pragma warning disable 414 private static readonly string LogHeader = "[TERRAIN MODULE]"; - +#pragma warning restore 414 + private readonly Commander m_commander = new Commander("terrain"); private readonly Dictionary m_floodeffects = diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index 23dee56..700fd8f 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs @@ -61,7 +61,10 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap private static readonly Color4 WATER_COLOR = new Color4(29, 72, 96, 216); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + +#pragma warning disable 414 private static string LogHeader = "[WARP 3D IMAGE MODULE]"; +#pragma warning restore 414 private Scene m_scene; private IRendering m_primMesher; diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs index b7400ea..eb1a970 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs @@ -306,6 +306,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation return base.Equals(obj); } + public override int GetHashCode() + { + return base.GetHashCode(); + } + public override string ToString() { StringBuilder buff = new StringBuilder(); diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index b059ecf..4208669 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs @@ -43,7 +43,10 @@ namespace OpenSim.Region.Framework.Scenes public abstract class SceneBase : IScene { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + +#pragma warning disable 414 private static readonly string LogHeader = "[SCENE]"; +#pragma warning restore 414 #region Events diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 57f9d01..e722fa5 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -271,7 +271,6 @@ namespace OpenSim.Region.Framework.Scenes //private int m_moveToPositionStateStatus; //***************************************************** - private bool m_collisionEventFlag = false; private object m_collisionEventLock = new Object(); private int m_movementAnimationUpdateCounter = 0; diff --git a/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs b/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs index 1107a2a..e797207 100644 --- a/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs +++ b/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs @@ -46,7 +46,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP public static class OpenSimTerrainCompressor { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + +#pragma warning disable 414 private static string LogHeader = "[TERRAIN COMPRESSOR]"; +#pragma warning restore 414 public const int END_OF_PATCHES = 97; diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs index fe6cb84..a7015e1 100644 --- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs @@ -192,7 +192,7 @@ namespace OpenSim.Region.Framework.Scenes if (ps.Texture != UUID.Zero) assetUuids[ps.Texture] = (sbyte)AssetType.Texture; } - catch (Exception e) + catch (Exception) { m_log.WarnFormat( "[UUID GATHERER]: Could not check particle system for part {0} {1} in object {2} {3} since it is corrupt. Continuing.", diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index c8320d0..e1aaf18 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs @@ -1426,9 +1426,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server return new byte[0]; } +#pragma warning disable 0067 public event ViewerEffectEventHandler OnViewerEffect; public event Action OnLogout; public event Action OnConnectionClosed; +#pragma warning restore 0067 public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message) { diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index 5a5a70c..45af212 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs @@ -65,7 +65,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice // Capability string prefixes private static readonly string m_parcelVoiceInfoRequestPath = "0207/"; private static readonly string m_provisionVoiceAccountRequestPath = "0208/"; - private static readonly string m_chatSessionRequestPath = "0209/"; + //private static readonly string m_chatSessionRequestPath = "0209/"; // Control info private static bool m_Enabled = false; diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index b4fae9d..dd44564 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs @@ -92,7 +92,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice // Capability strings private static readonly string m_parcelVoiceInfoRequestPath = "0107/"; private static readonly string m_provisionVoiceAccountRequestPath = "0108/"; - private static readonly string m_chatSessionRequestPath = "0109/"; + //private static readonly string m_chatSessionRequestPath = "0109/"; // Control info, e.g. vivox server, admin user, admin password private static bool m_pluginEnabled = false; @@ -1325,4 +1325,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice return false; } } -} \ No newline at end of file +} diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs index e498c6a..c38bb3e 100644 --- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs +++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs @@ -276,7 +276,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore { ovalue = OSDParser.DeserializeJson(value); } - catch (Exception e) + catch (Exception) { if (value.StartsWith("'") && value.EndsWith("'")) { diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs index b502a55..26044f0 100644 --- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs @@ -262,7 +262,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore { map = new JsonStore(value); } - catch (Exception e) + catch (Exception) { m_log.ErrorFormat("[JsonStore]: Unable to initialize store from {0}", value); return false; @@ -285,8 +285,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore lock (m_JsonValueStore) return m_JsonValueStore.Remove(storeID); - - return true; } // ----------------------------------------------------------------- diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index 1345db9..4cd5676 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs @@ -103,7 +103,9 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule #region IMoneyModule Members +#pragma warning disable 0067 public event ObjectPaid OnObjectPaid; +#pragma warning restore 0067 public int UploadCharge { diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs index 0d17e0e..c1a37cc 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs @@ -36,8 +36,6 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin { public class BasicActor : PhysicsActor { - private Vector3 _size; - public BasicActor(Vector3 size) { Size = size; diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs index aca1ed4..f833d54 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs @@ -2255,7 +2255,6 @@ private sealed class BulletConstraintXNA : BulletConstraint world.LastCollisionDesc = 0; world.LastEntityProperty = 0; numSimSteps = world.StepSimulation(timeStep, m_maxSubSteps, m_fixedTimeStep); - int updates = 0; PersistentManifold contactManifold; CollisionObject objA; diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs index 769896b..05374e8 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs @@ -42,7 +42,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin { public sealed class BSDynamics : BSActor { +#pragma warning disable 414 private static string LogHeader = "[BULLETSIM VEHICLE]"; +#pragma warning restore 414 // the prim this dynamic controller belongs to private BSPrimLinkable ControllingPrim { get; set; } @@ -123,7 +125,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin // Just some recomputed constants: static readonly float PIOverFour = ((float)Math.PI) / 4f; +#pragma warning disable 414 static readonly float PIOverTwo = ((float)Math.PI) / 2f; +#pragma warning restore 414 public BSDynamics(BSScene myScene, BSPrim myPrim, string actorName) : base(myScene, myPrim, actorName) diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs index 8f12189..6f4f686 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs @@ -37,7 +37,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin public sealed class BSLinksetCompound : BSLinkset { +#pragma warning disable 414 private static string LogHeader = "[BULLETSIM LINKSET COMPOUND]"; +#pragma warning restore 414 public BSLinksetCompound(BSScene scene, BSPrimLinkable parent) : base(scene, parent) diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs index 126b146..430d645 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs @@ -42,7 +42,9 @@ public class BSPrimLinkable : BSPrimDisplaced // operations necessary for keeping the linkset created and, additionally, this // calls the linkset implementation for its creation and management. +#pragma warning disable 414 private static readonly string LogHeader = "[BULLETS PRIMLINKABLE]"; +#pragma warning restore 414 // This adds the overrides for link() and delink() so the prim is linkable. diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 2d2e55f..9fa55ce 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs @@ -88,7 +88,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters public BSConstraintCollection Constraints { get; private set; } // Simulation parameters - internal float m_physicsStepTime; // if running independently, the interval simulated by default + //internal float m_physicsStepTime; // if running independently, the interval simulated by default internal int m_maxSubSteps; internal float m_fixedTimeStep; diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs index 721a8eb..d1de844 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs @@ -36,7 +36,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin { public sealed class BSShapeCollection : IDisposable { +#pragma warning disable 414 private static string LogHeader = "[BULLETSIM SHAPE COLLECTION]"; +#pragma warning restore 414 private BSScene m_physicsScene { get; set; } diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs index fbe320b..b344ba1 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs @@ -554,7 +554,10 @@ public class BSShapeMesh : BSShape // ============================================================================================================ public class BSShapeHull : BSShape { +#pragma warning disable 414 private static string LogHeader = "[BULLETSIM SHAPE HULL]"; +#pragma warning restore 414 + public static Dictionary Hulls = new Dictionary(); public BSShapeHull(BulletShape pShape) : base(pShape) @@ -1002,7 +1005,10 @@ public class BSShapeCompound : BSShape // ============================================================================================================ public class BSShapeConvexHull : BSShape { +#pragma warning disable 414 private static string LogHeader = "[BULLETSIM SHAPE CONVEX HULL]"; +#pragma warning restore 414 + public static Dictionary ConvexHulls = new Dictionary(); public BSShapeConvexHull(BulletShape pShape) : base(pShape) @@ -1098,7 +1104,10 @@ public class BSShapeConvexHull : BSShape // ============================================================================================================ public class BSShapeGImpact : BSShape { +#pragma warning disable 414 private static string LogHeader = "[BULLETSIM SHAPE GIMPACT]"; +#pragma warning restore 414 + public static Dictionary GImpacts = new Dictionary(); public BSShapeGImpact(BulletShape pShape) : base(pShape) @@ -1205,8 +1214,12 @@ public class BSShapeGImpact : BSShape // ============================================================================================================ public class BSShapeAvatar : BSShape { +#pragma warning disable 414 private static string LogHeader = "[BULLETSIM SHAPE AVATAR]"; - public BSShapeAvatar() : base() +#pragma warning restore 414 + + public BSShapeAvatar() + : base() { } public static BSShape GetReference(BSPhysObject prim) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 6afabf9..4d20e13 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -5200,8 +5200,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // NOTE: 3rd case is needed because a NULL_KEY comes through as // type 'obj' and wrongly returns "" else if (!(src.Data[index] is LSL_String || - src.Data[index] is LSL_Key || - src.Data[index] == "00000000-0000-0000-0000-000000000000")) + src.Data[index] is LSL_Key || + src.Data[index].ToString() == "00000000-0000-0000-0000-000000000000")) { return ""; } diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 50f9377..7d21a4b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs @@ -1377,27 +1377,6 @@ namespace OpenSim.Region.ScriptEngine.Shared } } - // - // BELOW IS WORK IN PROGRESS... IT WILL CHANGE, SO DON'T USE YET! :) - // - - public struct StringTest - { - // Our own little string - internal string actualString; - public static implicit operator bool(StringTest mString) - { - if (mString.actualString.Length == 0) - return true; - return false; - } - public override string ToString() - { - return actualString; - } - - } - [Serializable] public struct key { diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs index 16d9b7d..37ca5a4 100644 --- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs @@ -48,7 +48,10 @@ namespace OpenSim.Server.Handlers.Grid public class GridServerPostHandler : BaseStreamHandler { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + +#pragma warning disable 414 private static string LogHeader = "[GRID HANDLER]"; +#pragma warning restore 414 private IGridService m_GridService; diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs index 6403882..2dfb862 100644 --- a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs +++ b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs @@ -53,11 +53,6 @@ namespace OpenSim.Server.Handlers.Profiles get; private set; } - public string ConfigName - { - get; private set; - } - public bool Enabled { get; private set; diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index bbf95ad..dec3d35 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs @@ -124,7 +124,10 @@ namespace OpenSim.Services.Interfaces public class GridRegion { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + +#pragma warning disable 414 private static readonly string LogHeader = "[GRID REGION]"; +#pragma warning restore 414 /// /// The port by which http communication occurs with the region diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 25c9417..5888cce 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs @@ -939,7 +939,7 @@ namespace OpenSim.Services.LLLoginService if (!keyValue.EndsWith("/")) keyValue = keyValue + "/"; - if (!account.ServiceURLs.ContainsKey(keyName) || (account.ServiceURLs.ContainsKey(keyName) && account.ServiceURLs[keyName] != keyValue)) + if (!account.ServiceURLs.ContainsKey(keyName) || (account.ServiceURLs.ContainsKey(keyName) && (string)account.ServiceURLs[keyName] != keyValue)) { account.ServiceURLs[keyName] = keyValue; newUrls = true; diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs index dd26cdc..c752055 100644 --- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs +++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs @@ -37,7 +37,6 @@ using OpenSim.Data; using OpenMetaverse; using OpenMetaverse.StructuredData; using OpenSim.Framework; -using OpenSim.Services.UserAccountService; namespace OpenSim.Services.ProfilesService { diff --git a/OpenSim/Tests/Common/Mock/MockScriptEngine.cs b/OpenSim/Tests/Common/Mock/MockScriptEngine.cs index b444241..57be1da 100644 --- a/OpenSim/Tests/Common/Mock/MockScriptEngine.cs +++ b/OpenSim/Tests/Common/Mock/MockScriptEngine.cs @@ -94,8 +94,10 @@ namespace OpenSim.Tests.Common public Type ReplaceableInterface { get { return null; } } +#pragma warning disable 0067 public event ScriptRemoved OnScriptRemoved; public event ObjectRemoved OnObjectRemoved; +#pragma warning restore 0067 public string GetXMLState (UUID itemID) { @@ -263,4 +265,4 @@ namespace OpenSim.Tests.Common PostedEvents.Clear(); } } -} \ No newline at end of file +} -- cgit v1.1