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

Eliminated many warnings

0.8.0.3
Oren Hurvitz 2014-04-22 20:04:12 +03:00
parent 617bc4710a
commit 998d7009a6
48 changed files with 101 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Data/MSSQL/MSSQLFriendsData.cs
View File

@ -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())

2
OpenSim/Data/MySQL/MySQLFriendsData.cs
View File

@ -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())
{

2
OpenSim/Data/MySQL/MySQLXAssetData.cs
View File

@ -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}",

2
OpenSim/Data/PGSQL/PGSQLFriendsData.cs
View File

@ -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;

2
OpenSim/Data/SQLite/SQLiteFriendsData.cs
View File

@ -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())
{

4
OpenSim/Data/SQLite/SQLiteSimulationData.cs
View File

@ -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();

1
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
View File

@ -50,7 +50,6 @@ namespace OpenSim.Data.SQLite
private SqliteConnection m_connection;
private string m_connectionString;
private FieldInfo[] m_Fields;
private Dictionary<string, FieldInfo> m_FieldMap =
new Dictionary<string, FieldInfo>();

5
OpenSim/Framework/Animation.cs
View File

@ -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()

2
OpenSim/Framework/Console/MockConsole.cs
View File

@ -40,7 +40,9 @@ namespace OpenSim.Framework.Console
/// </summary>
public class MockConsole : ICommandConsole
{
#pragma warning disable 0067
public event OnOutputDelegate OnOutput;
#pragma warning restore 0067
private MockCommands m_commands = new MockCommands();

2
OpenSim/Framework/Tests/UtilTest.cs
View File

@ -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,

25
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -71,7 +71,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
#region Events
public event GenericMessage OnGenericMessage;
public event BinaryGenericMessage OnBinaryGenericMessage;
public event Action<IClientAPI> 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<IClientAPI> 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<UUID> 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<Vector3, bool, bool> 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<UUID> 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

2
OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
View File

@ -140,7 +140,7 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
return ret.ToArray();
}
catch (XmlException e)
catch (XmlException)
{
return null;
}

2
OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
View File

@ -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<Scene> m_Scenes = new List<Scene>();

2
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -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;

2
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
View File

@ -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);
}

2
OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
View File

@ -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)

2
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -848,8 +848,6 @@ namespace OpenSim.Region.CoreModules.World.Land
/// </param>
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

2
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@ -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);
}

2
OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
View File

@ -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}",

5
OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
View File

@ -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<StandardTerrainEffects, ITerrainFloodEffect> m_floodeffects =

3
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
View File

@ -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;

5
OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
View File

@ -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();

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

@ -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

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

@ -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;

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

@ -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;

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

@ -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.",

2
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@ -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<IClientAPI> OnLogout;
public event Action<IClientAPI> OnConnectionClosed;
#pragma warning restore 0067
public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message)
{

2
OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
View File

@ -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;

4
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
View File

@ -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;
}
}
}
}

2
OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
View File

@ -276,7 +276,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
{
ovalue = OSDParser.DeserializeJson(value);
}
catch (Exception e)
catch (Exception)
{
if (value.StartsWith("'") && value.EndsWith("'"))
{

4
OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
View File

@ -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;
}
// -----------------------------------------------------------------

2
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
View File

@ -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
{

2
OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
View File

@ -36,8 +36,6 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
{
public class BasicActor : PhysicsActor
{
private Vector3 _size;
public BasicActor(Vector3 size)
{
Size = size;

1
OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
View File

@ -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;

4
OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
View File

@ -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)

2
OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
View File

@ -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)

2
OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
View File

@ -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.

2
OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
View File

@ -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;

2
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
View File

@ -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; }

15
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
View File

@ -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<System.UInt64, BSShapeHull> Hulls = new Dictionary<System.UInt64, BSShapeHull>();
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<System.UInt64, BSShapeConvexHull> ConvexHulls = new Dictionary<System.UInt64, BSShapeConvexHull>();
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<System.UInt64, BSShapeGImpact> GImpacts = new Dictionary<System.UInt64, BSShapeGImpact>();
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)

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -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 "";
}

21
OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
View File

@ -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
{

3
OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
View File

@ -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;

5
OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
View File

@ -53,11 +53,6 @@ namespace OpenSim.Server.Handlers.Profiles
get; private set;
}
public string ConfigName
{
get; private set;
}
public bool Enabled
{
get; private set;

3
OpenSim/Services/Interfaces/IGridService.cs
View File

@ -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
/// <summary>
/// The port by which http communication occurs with the region

2
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -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;

1
OpenSim/Services/UserProfilesService/UserProfilesService.cs
View File

@ -37,7 +37,6 @@ using OpenSim.Data;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using OpenSim.Framework;
using OpenSim.Services.UserAccountService;
namespace OpenSim.Services.ProfilesService
{

4
OpenSim/Tests/Common/Mock/MockScriptEngine.cs
View File

@ -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();
}
}
}
}