aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLFriendsData.cs4
-rw-r--r--OpenSim/Data/MySQL/MySQLFriendsData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLXAssetData.cs2
-rw-r--r--OpenSim/Data/PGSQL/PGSQLFriendsData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteFriendsData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteSimulationData.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserProfilesData.cs1
-rw-r--r--OpenSim/Framework/Animation.cs5
-rw-r--r--OpenSim/Framework/Console/MockConsole.cs2
-rw-r--r--OpenSim/Framework/Tests/UtilTest.cs2
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs25
-rw-r--r--OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/TerrainCompressor.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs2
-rw-r--r--OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs2
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs1
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs4
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs2
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs2
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs2
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs2
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSShapes.cs15
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs21
-rw-r--r--OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs3
-rw-r--r--OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs5
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs3
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs2
-rw-r--r--OpenSim/Services/UserProfilesService/UserProfilesService.cs1
-rw-r--r--OpenSim/Tests/Common/Mock/MockScriptEngine.cs4
48 files changed, 101 insertions, 77 deletions
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 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -55,7 +55,7 @@ namespace OpenSim.Data.MSSQL
55 return Delete(principalID.ToString(), friend); 55 return Delete(principalID.ToString(), friend);
56 } 56 }
57 57
58 public bool Delete(string principalID, string friend) 58 public override bool Delete(string principalID, string friend)
59 { 59 {
60 using (SqlConnection conn = new SqlConnection(m_ConnectionString)) 60 using (SqlConnection conn = new SqlConnection(m_ConnectionString))
61 using (SqlCommand cmd = new SqlCommand()) 61 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
47 return Delete(principalID.ToString(), friend); 47 return Delete(principalID.ToString(), friend);
48 } 48 }
49 49
50 public bool Delete(string principalID, string friend) 50 public override bool Delete(string principalID, string friend)
51 { 51 {
52 using (MySqlCommand cmd = new MySqlCommand()) 52 using (MySqlCommand cmd = new MySqlCommand())
53 { 53 {
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
346 cmd.ExecuteNonQuery(); 346 cmd.ExecuteNonQuery();
347 } 347 }
348 } 348 }
349 catch (Exception e) 349 catch (Exception)
350 { 350 {
351 m_log.ErrorFormat( 351 m_log.ErrorFormat(
352 "[XASSET MYSQL DB]: Failure updating access_time for asset {0} with name {1}", 352 "[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
51 } 51 }
52 52
53 53
54 public bool Delete(string principalID, string friend) 54 public override bool Delete(string principalID, string friend)
55 { 55 {
56 UUID princUUID = UUID.Zero; 56 UUID princUUID = UUID.Zero;
57 57
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
67 return Delete(principalID.ToString(), friend); 67 return Delete(principalID.ToString(), friend);
68 } 68 }
69 69
70 public bool Delete(string principalID, string friend) 70 public override bool Delete(string principalID, string friend)
71 { 71 {
72 using (SqliteCommand cmd = new SqliteCommand()) 72 using (SqliteCommand cmd = new SqliteCommand())
73 { 73 {
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
1605 prim.SitName = (String)row["SitName"]; 1605 prim.SitName = (String)row["SitName"];
1606 prim.TouchName = (String)row["TouchName"]; 1606 prim.TouchName = (String)row["TouchName"];
1607 // permissions 1607 // permissions
1608 prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]); 1608 prim.Flags = (PrimFlags)Convert.ToUInt32(row["ObjectFlags"]);
1609 prim.CreatorIdentification = (String)row["CreatorID"]; 1609 prim.CreatorIdentification = (String)row["CreatorID"];
1610 prim.OwnerID = new UUID((String)row["OwnerID"]); 1610 prim.OwnerID = new UUID((String)row["OwnerID"]);
1611 prim.GroupID = new UUID((String)row["GroupID"]); 1611 prim.GroupID = new UUID((String)row["GroupID"]);
@@ -2034,7 +2034,7 @@ namespace OpenSim.Data.SQLite
2034 row["SitName"] = prim.SitName; 2034 row["SitName"] = prim.SitName;
2035 row["TouchName"] = prim.TouchName; 2035 row["TouchName"] = prim.TouchName;
2036 // permissions 2036 // permissions
2037 row["ObjectFlags"] = prim.ObjectFlags; 2037 row["ObjectFlags"] = (uint)prim.Flags;
2038 row["CreatorID"] = prim.CreatorIdentification.ToString(); 2038 row["CreatorID"] = prim.CreatorIdentification.ToString();
2039 row["OwnerID"] = prim.OwnerID.ToString(); 2039 row["OwnerID"] = prim.OwnerID.ToString();
2040 row["GroupID"] = prim.GroupID.ToString(); 2040 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
50 private SqliteConnection m_connection; 50 private SqliteConnection m_connection;
51 private string m_connectionString; 51 private string m_connectionString;
52 52
53 private FieldInfo[] m_Fields;
54 private Dictionary<string, FieldInfo> m_FieldMap = 53 private Dictionary<string, FieldInfo> m_FieldMap =
55 new Dictionary<string, FieldInfo>(); 54 new Dictionary<string, FieldInfo>();
56 55
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
132 return base.Equals(obj); 132 return base.Equals(obj);
133 } 133 }
134 134
135 public override int GetHashCode()
136 {
137 return base.GetHashCode();
138 }
139
135 public override string ToString() 140 public override string ToString()
136 { 141 {
137 return "AnimID=" + AnimID.ToString() 142 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
40 /// </summary> 40 /// </summary>
41 public class MockConsole : ICommandConsole 41 public class MockConsole : ICommandConsole
42 { 42 {
43#pragma warning disable 0067
43 public event OnOutputDelegate OnOutput; 44 public event OnOutputDelegate OnOutput;
45#pragma warning restore 0067
44 46
45 private MockCommands m_commands = new MockCommands(); 47 private MockCommands m_commands = new MockCommands();
46 48
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
299 uint z1 = 22; 299 uint z1 = 22;
300 ulong regionHandle2; 300 ulong regionHandle2;
301 uint x2, y2, z2; 301 uint x2, y2, z2;
302 UUID fakeParcelID1, fakeParcelID2, uuid; 302 UUID fakeParcelID1, uuid;
303 303
304 ulong bigInt64 = Util.BytesToUInt64Big(hexBytes8); 304 ulong bigInt64 = Util.BytesToUInt64Big(hexBytes8);
305 Assert.AreEqual(var64Bit, bigInt64, 305 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
71 71
72 #region Events 72 #region Events
73 73
74 public event GenericMessage OnGenericMessage;
75 public event BinaryGenericMessage OnBinaryGenericMessage; 74 public event BinaryGenericMessage OnBinaryGenericMessage;
76 public event Action<IClientAPI> OnLogout; 75 public event Action<IClientAPI> OnLogout;
77 public event ObjectPermissions OnObjectPermissions; 76 public event ObjectPermissions OnObjectPermissions;
@@ -79,13 +78,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
79 public event ViewerEffectEventHandler OnViewerEffect; 78 public event ViewerEffectEventHandler OnViewerEffect;
80 public event ImprovedInstantMessage OnInstantMessage; 79 public event ImprovedInstantMessage OnInstantMessage;
81 public event ChatMessage OnChatFromClient; 80 public event ChatMessage OnChatFromClient;
82 public event TextureRequest OnRequestTexture;
83 public event RezObject OnRezObject; 81 public event RezObject OnRezObject;
84 public event DeRezObject OnDeRezObject; 82 public event DeRezObject OnDeRezObject;
85 public event ModifyTerrain OnModifyTerrain; 83 public event ModifyTerrain OnModifyTerrain;
86 public event Action<IClientAPI> OnRegionHandShakeReply; 84 public event Action<IClientAPI> OnRegionHandShakeReply;
87 public event GenericCall1 OnRequestWearables; 85 public event GenericCall1 OnRequestWearables;
88 public event CachedTextureRequest OnCachedTextureRequest;
89 public event SetAppearance OnSetAppearance; 86 public event SetAppearance OnSetAppearance;
90 public event AvatarNowWearing OnAvatarNowWearing; 87 public event AvatarNowWearing OnAvatarNowWearing;
91 public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; 88 public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
@@ -138,15 +135,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
138 public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation; 135 public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
139 public event UpdateVector OnUpdatePrimScale; 136 public event UpdateVector OnUpdatePrimScale;
140 public event UpdateVector OnUpdatePrimGroupScale; 137 public event UpdateVector OnUpdatePrimGroupScale;
141 public event StatusChange OnChildAgentStatus;
142 public event GenericCall2 OnStopMovement;
143 public event Action<UUID> OnRemoveAvatar;
144 public event RequestMapBlocks OnRequestMapBlocks; 138 public event RequestMapBlocks OnRequestMapBlocks;
145 public event RequestMapName OnMapNameRequest; 139 public event RequestMapName OnMapNameRequest;
146 public event TeleportLocationRequest OnTeleportLocationRequest; 140 public event TeleportLocationRequest OnTeleportLocationRequest;
147 public event TeleportLandmarkRequest OnTeleportLandmarkRequest; 141 public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
148 public event TeleportCancel OnTeleportCancel; 142 public event TeleportCancel OnTeleportCancel;
149 public event DisconnectUser OnDisconnectUser;
150 public event RequestAvatarProperties OnRequestAvatarProperties; 143 public event RequestAvatarProperties OnRequestAvatarProperties;
151 public event SetAlwaysRun OnSetAlwaysRun; 144 public event SetAlwaysRun OnSetAlwaysRun;
152 public event FetchInventory OnAgentDataUpdateRequest; 145 public event FetchInventory OnAgentDataUpdateRequest;
@@ -176,7 +169,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
176 public event UpdateTaskInventory OnUpdateTaskInventory; 169 public event UpdateTaskInventory OnUpdateTaskInventory;
177 public event MoveTaskInventory OnMoveTaskItem; 170 public event MoveTaskInventory OnMoveTaskItem;
178 public event RemoveTaskInventory OnRemoveTaskItem; 171 public event RemoveTaskInventory OnRemoveTaskItem;
179 public event RequestAsset OnRequestAsset;
180 public event UUIDNameRequest OnNameFromUUIDRequest; 172 public event UUIDNameRequest OnNameFromUUIDRequest;
181 public event ParcelAccessListRequest OnParcelAccessListRequest; 173 public event ParcelAccessListRequest OnParcelAccessListRequest;
182 public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest; 174 public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest;
@@ -207,7 +199,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
207 public event RequestPayPrice OnRequestPayPrice; 199 public event RequestPayPrice OnRequestPayPrice;
208 public event ObjectSaleInfo OnObjectSaleInfo; 200 public event ObjectSaleInfo OnObjectSaleInfo;
209 public event ObjectBuy OnObjectBuy; 201 public event ObjectBuy OnObjectBuy;
210 public event BuyObjectInventory OnBuyObjectInventory;
211 public event AgentSit OnUndo; 202 public event AgentSit OnUndo;
212 public event AgentSit OnRedo; 203 public event AgentSit OnRedo;
213 public event LandUndo OnLandUndo; 204 public event LandUndo OnLandUndo;
@@ -216,7 +207,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
216 public event RequestObjectPropertiesFamily OnObjectGroupRequest; 207 public event RequestObjectPropertiesFamily OnObjectGroupRequest;
217 public event DetailedEstateDataRequest OnDetailedEstateDataRequest; 208 public event DetailedEstateDataRequest OnDetailedEstateDataRequest;
218 public event SetEstateFlagsRequest OnSetEstateFlagsRequest; 209 public event SetEstateFlagsRequest OnSetEstateFlagsRequest;
219 public event SetEstateTerrainBaseTexture OnSetEstateTerrainBaseTexture;
220 public event SetEstateTerrainDetailTexture OnSetEstateTerrainDetailTexture; 210 public event SetEstateTerrainDetailTexture OnSetEstateTerrainDetailTexture;
221 public event SetEstateTerrainTextureHeights OnSetEstateTerrainTextureHeights; 211 public event SetEstateTerrainTextureHeights OnSetEstateTerrainTextureHeights;
222 public event CommitEstateTerrainTextureRequest OnCommitEstateTerrainTextureRequest; 212 public event CommitEstateTerrainTextureRequest OnCommitEstateTerrainTextureRequest;
@@ -239,7 +229,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
239 public event GetScriptRunning OnGetScriptRunning; 229 public event GetScriptRunning OnGetScriptRunning;
240 public event SetScriptRunning OnSetScriptRunning; 230 public event SetScriptRunning OnSetScriptRunning;
241 public event Action<Vector3, bool, bool> OnAutoPilotGo; 231 public event Action<Vector3, bool, bool> OnAutoPilotGo;
242 public event TerrainUnacked OnUnackedTerrain;
243 public event ActivateGesture OnActivateGesture; 232 public event ActivateGesture OnActivateGesture;
244 public event DeactivateGesture OnDeactivateGesture; 233 public event DeactivateGesture OnDeactivateGesture;
245 public event ObjectOwner OnObjectOwner; 234 public event ObjectOwner OnObjectOwner;
@@ -297,6 +286,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
297 public event GodlikeMessage onGodlikeMessage; 286 public event GodlikeMessage onGodlikeMessage;
298 public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; 287 public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
299 288
289#pragma warning disable 0067
290 public event GenericMessage OnGenericMessage;
291 public event TextureRequest OnRequestTexture;
292 public event StatusChange OnChildAgentStatus;
293 public event GenericCall2 OnStopMovement;
294 public event Action<UUID> OnRemoveAvatar;
295 public event DisconnectUser OnDisconnectUser;
296 public event RequestAsset OnRequestAsset;
297 public event BuyObjectInventory OnBuyObjectInventory;
298 public event SetEstateTerrainBaseTexture OnSetEstateTerrainBaseTexture;
299 public event TerrainUnacked OnUnackedTerrain;
300 public event CachedTextureRequest OnCachedTextureRequest;
301#pragma warning restore 0067
302
300 #endregion Events 303 #endregion Events
301 304
302 #region Class Members 305 #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
140 140
141 return ret.ToArray(); 141 return ret.ToArray();
142 } 142 }
143 catch (XmlException e) 143 catch (XmlException)
144 { 144 {
145 return null; 145 return null;
146 } 146 }
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
49 private static readonly ILog m_log = LogManager.GetLogger( 49 private static readonly ILog m_log = LogManager.GetLogger(
50 MethodBase.GetCurrentMethod().DeclaringType); 50 MethodBase.GetCurrentMethod().DeclaringType);
51 51
52#pragma warning disable 0067
52 public event PresenceChange OnPresenceChange; 53 public event PresenceChange OnPresenceChange;
53 public event BulkPresenceData OnBulkPresenceData; 54 public event BulkPresenceData OnBulkPresenceData;
55#pragma warning restore 0067
54 56
55 protected List<Scene> m_Scenes = new List<Scene>(); 57 protected List<Scene> m_Scenes = new List<Scene>();
56 58
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
1540 1540
1541 public bool Cross(ScenePresence agent, bool isFlying) 1541 public bool Cross(ScenePresence agent, bool isFlying)
1542 { 1542 {
1543 uint x;
1544 uint y;
1545 Vector3 newpos; 1543 Vector3 newpos;
1546 string version; 1544 string version;
1547 string failureReason; 1545 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
426 // return base.UpdateAgent(reg, finalDestination, agentData, sp); 426 // return base.UpdateAgent(reg, finalDestination, agentData, sp);
427 //} 427 //}
428 428
429 public virtual void TriggerTeleportHome(UUID id, IClientAPI client) 429 public override void TriggerTeleportHome(UUID id, IClientAPI client)
430 { 430 {
431 TeleportHome(id, client); 431 TeleportHome(id, client);
432 } 432 }
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
686 if (!ConsoleUtil.TryParseConsoleUuid(MainConsole.Instance, cmd[2], out userId)) 686 if (!ConsoleUtil.TryParseConsoleUuid(MainConsole.Instance, cmd[2], out userId))
687 return; 687 return;
688 688
689 string[] names;
690
691 UserData ud; 689 UserData ud;
692 690
693 lock (m_UserCache) 691 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
848 /// </param> 848 /// </param>
849 private ILandObject GetLandObject(int x, int y, bool returnNullIfLandObjectOutsideBounds) 849 private ILandObject GetLandObject(int x, int y, bool returnNullIfLandObjectOutsideBounds)
850 { 850 {
851 ILandObject ret = null;
852
853 if (x >= m_scene.RegionInfo.RegionSizeX || y >= m_scene.RegionInfo.RegionSizeY || x < 0 || y < 0) 851 if (x >= m_scene.RegionInfo.RegionSizeX || y >= m_scene.RegionInfo.RegionSizeY || x < 0 || y < 0)
854 { 852 {
855 // These exceptions here will cause a lot of complaints from the users specifically because 853 // 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
927 { 927 {
928 tempConvertMap[x, y] = bit; 928 tempConvertMap[x, y] = bit;
929 } 929 }
930 catch (Exception e) 930 catch (Exception)
931 { 931 {
932 m_log.DebugFormat("{0} ConvertBytestoLandBitmap: i={1}, x={2}, y={3}", LogHeader, i, x, y); 932 m_log.DebugFormat("{0} ConvertBytestoLandBitmap: i={1}, x={2}, y={3}", LogHeader, i, x, y);
933 } 933 }
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
124 { 124 {
125 mapbmp = new Bitmap(m_scene.RegionInfo.MaptileStaticFile); 125 mapbmp = new Bitmap(m_scene.RegionInfo.MaptileStaticFile);
126 } 126 }
127 catch (Exception e) 127 catch (Exception)
128 { 128 {
129 m_log.ErrorFormat( 129 m_log.ErrorFormat(
130 "[MAPTILE]: Failed to load Static map image texture file: {0} for {1}", 130 "[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
74 #endregion 74 #endregion
75 75
76 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 76 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
77
78#pragma warning disable 414
77 private static readonly string LogHeader = "[TERRAIN MODULE]"; 79 private static readonly string LogHeader = "[TERRAIN MODULE]";
78 80#pragma warning restore 414
81
79 private readonly Commander m_commander = new Commander("terrain"); 82 private readonly Commander m_commander = new Commander("terrain");
80 83
81 private readonly Dictionary<StandardTerrainEffects, ITerrainFloodEffect> m_floodeffects = 84 private readonly Dictionary<StandardTerrainEffects, ITerrainFloodEffect> 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
61 private static readonly Color4 WATER_COLOR = new Color4(29, 72, 96, 216); 61 private static readonly Color4 WATER_COLOR = new Color4(29, 72, 96, 216);
62 62
63 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 63 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
64
65#pragma warning disable 414
64 private static string LogHeader = "[WARP 3D IMAGE MODULE]"; 66 private static string LogHeader = "[WARP 3D IMAGE MODULE]";
67#pragma warning restore 414
65 68
66 private Scene m_scene; 69 private Scene m_scene;
67 private IRendering m_primMesher; 70 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
306 return base.Equals(obj); 306 return base.Equals(obj);
307 } 307 }
308 308
309 public override int GetHashCode()
310 {
311 return base.GetHashCode();
312 }
313
309 public override string ToString() 314 public override string ToString()
310 { 315 {
311 StringBuilder buff = new StringBuilder(); 316 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
43 public abstract class SceneBase : IScene 43 public abstract class SceneBase : IScene
44 { 44 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46
47#pragma warning disable 414
46 private static readonly string LogHeader = "[SCENE]"; 48 private static readonly string LogHeader = "[SCENE]";
49#pragma warning restore 414
47 50
48 #region Events 51 #region Events
49 52
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
271 //private int m_moveToPositionStateStatus; 271 //private int m_moveToPositionStateStatus;
272 //***************************************************** 272 //*****************************************************
273 273
274 private bool m_collisionEventFlag = false;
275 private object m_collisionEventLock = new Object(); 274 private object m_collisionEventLock = new Object();
276 275
277 private int m_movementAnimationUpdateCounter = 0; 276 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
46 public static class OpenSimTerrainCompressor 46 public static class OpenSimTerrainCompressor
47 { 47 {
48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
49
50#pragma warning disable 414
49 private static string LogHeader = "[TERRAIN COMPRESSOR]"; 51 private static string LogHeader = "[TERRAIN COMPRESSOR]";
52#pragma warning restore 414
50 53
51 public const int END_OF_PATCHES = 97; 54 public const int END_OF_PATCHES = 97;
52 55
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
192 if (ps.Texture != UUID.Zero) 192 if (ps.Texture != UUID.Zero)
193 assetUuids[ps.Texture] = (sbyte)AssetType.Texture; 193 assetUuids[ps.Texture] = (sbyte)AssetType.Texture;
194 } 194 }
195 catch (Exception e) 195 catch (Exception)
196 { 196 {
197 m_log.WarnFormat( 197 m_log.WarnFormat(
198 "[UUID GATHERER]: Could not check particle system for part {0} {1} in object {2} {3} since it is corrupt. Continuing.", 198 "[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
1426 return new byte[0]; 1426 return new byte[0];
1427 } 1427 }
1428 1428
1429#pragma warning disable 0067
1429 public event ViewerEffectEventHandler OnViewerEffect; 1430 public event ViewerEffectEventHandler OnViewerEffect;
1430 public event Action<IClientAPI> OnLogout; 1431 public event Action<IClientAPI> OnLogout;
1431 public event Action<IClientAPI> OnConnectionClosed; 1432 public event Action<IClientAPI> OnConnectionClosed;
1433#pragma warning restore 0067
1432 1434
1433 public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message) 1435 public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message)
1434 { 1436 {
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
65 // Capability string prefixes 65 // Capability string prefixes
66 private static readonly string m_parcelVoiceInfoRequestPath = "0207/"; 66 private static readonly string m_parcelVoiceInfoRequestPath = "0207/";
67 private static readonly string m_provisionVoiceAccountRequestPath = "0208/"; 67 private static readonly string m_provisionVoiceAccountRequestPath = "0208/";
68 private static readonly string m_chatSessionRequestPath = "0209/"; 68 //private static readonly string m_chatSessionRequestPath = "0209/";
69 69
70 // Control info 70 // Control info
71 private static bool m_Enabled = false; 71 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
92 // Capability strings 92 // Capability strings
93 private static readonly string m_parcelVoiceInfoRequestPath = "0107/"; 93 private static readonly string m_parcelVoiceInfoRequestPath = "0107/";
94 private static readonly string m_provisionVoiceAccountRequestPath = "0108/"; 94 private static readonly string m_provisionVoiceAccountRequestPath = "0108/";
95 private static readonly string m_chatSessionRequestPath = "0109/"; 95 //private static readonly string m_chatSessionRequestPath = "0109/";
96 96
97 // Control info, e.g. vivox server, admin user, admin password 97 // Control info, e.g. vivox server, admin user, admin password
98 private static bool m_pluginEnabled = false; 98 private static bool m_pluginEnabled = false;
@@ -1325,4 +1325,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1325 return false; 1325 return false;
1326 } 1326 }
1327 } 1327 }
1328} \ No newline at end of file 1328}
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
276 { 276 {
277 ovalue = OSDParser.DeserializeJson(value); 277 ovalue = OSDParser.DeserializeJson(value);
278 } 278 }
279 catch (Exception e) 279 catch (Exception)
280 { 280 {
281 if (value.StartsWith("'") && value.EndsWith("'")) 281 if (value.StartsWith("'") && value.EndsWith("'"))
282 { 282 {
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
262 { 262 {
263 map = new JsonStore(value); 263 map = new JsonStore(value);
264 } 264 }
265 catch (Exception e) 265 catch (Exception)
266 { 266 {
267 m_log.ErrorFormat("[JsonStore]: Unable to initialize store from {0}", value); 267 m_log.ErrorFormat("[JsonStore]: Unable to initialize store from {0}", value);
268 return false; 268 return false;
@@ -285,8 +285,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
285 285
286 lock (m_JsonValueStore) 286 lock (m_JsonValueStore)
287 return m_JsonValueStore.Remove(storeID); 287 return m_JsonValueStore.Remove(storeID);
288
289 return true;
290 } 288 }
291 289
292 // ----------------------------------------------------------------- 290 // -----------------------------------------------------------------
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
103 103
104 #region IMoneyModule Members 104 #region IMoneyModule Members
105 105
106#pragma warning disable 0067
106 public event ObjectPaid OnObjectPaid; 107 public event ObjectPaid OnObjectPaid;
108#pragma warning restore 0067
107 109
108 public int UploadCharge 110 public int UploadCharge
109 { 111 {
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
36{ 36{
37 public class BasicActor : PhysicsActor 37 public class BasicActor : PhysicsActor
38 { 38 {
39 private Vector3 _size;
40
41 public BasicActor(Vector3 size) 39 public BasicActor(Vector3 size)
42 { 40 {
43 Size = size; 41 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
2255 world.LastCollisionDesc = 0; 2255 world.LastCollisionDesc = 0;
2256 world.LastEntityProperty = 0; 2256 world.LastEntityProperty = 0;
2257 numSimSteps = world.StepSimulation(timeStep, m_maxSubSteps, m_fixedTimeStep); 2257 numSimSteps = world.StepSimulation(timeStep, m_maxSubSteps, m_fixedTimeStep);
2258 int updates = 0;
2259 2258
2260 PersistentManifold contactManifold; 2259 PersistentManifold contactManifold;
2261 CollisionObject objA; 2260 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
42{ 42{
43 public sealed class BSDynamics : BSActor 43 public sealed class BSDynamics : BSActor
44 { 44 {
45#pragma warning disable 414
45 private static string LogHeader = "[BULLETSIM VEHICLE]"; 46 private static string LogHeader = "[BULLETSIM VEHICLE]";
47#pragma warning restore 414
46 48
47 // the prim this dynamic controller belongs to 49 // the prim this dynamic controller belongs to
48 private BSPrimLinkable ControllingPrim { get; set; } 50 private BSPrimLinkable ControllingPrim { get; set; }
@@ -123,7 +125,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin
123 125
124 // Just some recomputed constants: 126 // Just some recomputed constants:
125 static readonly float PIOverFour = ((float)Math.PI) / 4f; 127 static readonly float PIOverFour = ((float)Math.PI) / 4f;
128#pragma warning disable 414
126 static readonly float PIOverTwo = ((float)Math.PI) / 2f; 129 static readonly float PIOverTwo = ((float)Math.PI) / 2f;
130#pragma warning restore 414
127 131
128 public BSDynamics(BSScene myScene, BSPrim myPrim, string actorName) 132 public BSDynamics(BSScene myScene, BSPrim myPrim, string actorName)
129 : base(myScene, myPrim, actorName) 133 : 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
37 37
38public sealed class BSLinksetCompound : BSLinkset 38public sealed class BSLinksetCompound : BSLinkset
39{ 39{
40#pragma warning disable 414
40 private static string LogHeader = "[BULLETSIM LINKSET COMPOUND]"; 41 private static string LogHeader = "[BULLETSIM LINKSET COMPOUND]";
42#pragma warning restore 414
41 43
42 public BSLinksetCompound(BSScene scene, BSPrimLinkable parent) 44 public BSLinksetCompound(BSScene scene, BSPrimLinkable parent)
43 : base(scene, parent) 45 : 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
42 // operations necessary for keeping the linkset created and, additionally, this 42 // operations necessary for keeping the linkset created and, additionally, this
43 // calls the linkset implementation for its creation and management. 43 // calls the linkset implementation for its creation and management.
44 44
45#pragma warning disable 414
45 private static readonly string LogHeader = "[BULLETS PRIMLINKABLE]"; 46 private static readonly string LogHeader = "[BULLETS PRIMLINKABLE]";
47#pragma warning restore 414
46 48
47 // This adds the overrides for link() and delink() so the prim is linkable. 49 // This adds the overrides for link() and delink() so the prim is linkable.
48 50
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
88 public BSConstraintCollection Constraints { get; private set; } 88 public BSConstraintCollection Constraints { get; private set; }
89 89
90 // Simulation parameters 90 // Simulation parameters
91 internal float m_physicsStepTime; // if running independently, the interval simulated by default 91 //internal float m_physicsStepTime; // if running independently, the interval simulated by default
92 92
93 internal int m_maxSubSteps; 93 internal int m_maxSubSteps;
94 internal float m_fixedTimeStep; 94 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
36{ 36{
37public sealed class BSShapeCollection : IDisposable 37public sealed class BSShapeCollection : IDisposable
38{ 38{
39#pragma warning disable 414
39 private static string LogHeader = "[BULLETSIM SHAPE COLLECTION]"; 40 private static string LogHeader = "[BULLETSIM SHAPE COLLECTION]";
41#pragma warning restore 414
40 42
41 private BSScene m_physicsScene { get; set; } 43 private BSScene m_physicsScene { get; set; }
42 44
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
554// ============================================================================================================ 554// ============================================================================================================
555public class BSShapeHull : BSShape 555public class BSShapeHull : BSShape
556{ 556{
557#pragma warning disable 414
557 private static string LogHeader = "[BULLETSIM SHAPE HULL]"; 558 private static string LogHeader = "[BULLETSIM SHAPE HULL]";
559#pragma warning restore 414
560
558 public static Dictionary<System.UInt64, BSShapeHull> Hulls = new Dictionary<System.UInt64, BSShapeHull>(); 561 public static Dictionary<System.UInt64, BSShapeHull> Hulls = new Dictionary<System.UInt64, BSShapeHull>();
559 562
560 public BSShapeHull(BulletShape pShape) : base(pShape) 563 public BSShapeHull(BulletShape pShape) : base(pShape)
@@ -1002,7 +1005,10 @@ public class BSShapeCompound : BSShape
1002// ============================================================================================================ 1005// ============================================================================================================
1003public class BSShapeConvexHull : BSShape 1006public class BSShapeConvexHull : BSShape
1004{ 1007{
1008#pragma warning disable 414
1005 private static string LogHeader = "[BULLETSIM SHAPE CONVEX HULL]"; 1009 private static string LogHeader = "[BULLETSIM SHAPE CONVEX HULL]";
1010#pragma warning restore 414
1011
1006 public static Dictionary<System.UInt64, BSShapeConvexHull> ConvexHulls = new Dictionary<System.UInt64, BSShapeConvexHull>(); 1012 public static Dictionary<System.UInt64, BSShapeConvexHull> ConvexHulls = new Dictionary<System.UInt64, BSShapeConvexHull>();
1007 1013
1008 public BSShapeConvexHull(BulletShape pShape) : base(pShape) 1014 public BSShapeConvexHull(BulletShape pShape) : base(pShape)
@@ -1098,7 +1104,10 @@ public class BSShapeConvexHull : BSShape
1098// ============================================================================================================ 1104// ============================================================================================================
1099public class BSShapeGImpact : BSShape 1105public class BSShapeGImpact : BSShape
1100{ 1106{
1107#pragma warning disable 414
1101 private static string LogHeader = "[BULLETSIM SHAPE GIMPACT]"; 1108 private static string LogHeader = "[BULLETSIM SHAPE GIMPACT]";
1109#pragma warning restore 414
1110
1102 public static Dictionary<System.UInt64, BSShapeGImpact> GImpacts = new Dictionary<System.UInt64, BSShapeGImpact>(); 1111 public static Dictionary<System.UInt64, BSShapeGImpact> GImpacts = new Dictionary<System.UInt64, BSShapeGImpact>();
1103 1112
1104 public BSShapeGImpact(BulletShape pShape) : base(pShape) 1113 public BSShapeGImpact(BulletShape pShape) : base(pShape)
@@ -1205,8 +1214,12 @@ public class BSShapeGImpact : BSShape
1205// ============================================================================================================ 1214// ============================================================================================================
1206public class BSShapeAvatar : BSShape 1215public class BSShapeAvatar : BSShape
1207{ 1216{
1217#pragma warning disable 414
1208 private static string LogHeader = "[BULLETSIM SHAPE AVATAR]"; 1218 private static string LogHeader = "[BULLETSIM SHAPE AVATAR]";
1209 public BSShapeAvatar() : base() 1219#pragma warning restore 414
1220
1221 public BSShapeAvatar()
1222 : base()
1210 { 1223 {
1211 } 1224 }
1212 public static BSShape GetReference(BSPhysObject prim) 1225 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
5200 // NOTE: 3rd case is needed because a NULL_KEY comes through as 5200 // NOTE: 3rd case is needed because a NULL_KEY comes through as
5201 // type 'obj' and wrongly returns "" 5201 // type 'obj' and wrongly returns ""
5202 else if (!(src.Data[index] is LSL_String || 5202 else if (!(src.Data[index] is LSL_String ||
5203 src.Data[index] is LSL_Key || 5203 src.Data[index] is LSL_Key ||
5204 src.Data[index] == "00000000-0000-0000-0000-000000000000")) 5204 src.Data[index].ToString() == "00000000-0000-0000-0000-000000000000"))
5205 { 5205 {
5206 return ""; 5206 return "";
5207 } 5207 }
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
1377 } 1377 }
1378 } 1378 }
1379 1379
1380 //
1381 // BELOW IS WORK IN PROGRESS... IT WILL CHANGE, SO DON'T USE YET! :)
1382 //
1383
1384 public struct StringTest
1385 {
1386 // Our own little string
1387 internal string actualString;
1388 public static implicit operator bool(StringTest mString)
1389 {
1390 if (mString.actualString.Length == 0)
1391 return true;
1392 return false;
1393 }
1394 public override string ToString()
1395 {
1396 return actualString;
1397 }
1398
1399 }
1400
1401 [Serializable] 1380 [Serializable]
1402 public struct key 1381 public struct key
1403 { 1382 {
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
48 public class GridServerPostHandler : BaseStreamHandler 48 public class GridServerPostHandler : BaseStreamHandler
49 { 49 {
50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
51
52#pragma warning disable 414
51 private static string LogHeader = "[GRID HANDLER]"; 53 private static string LogHeader = "[GRID HANDLER]";
54#pragma warning restore 414
52 55
53 private IGridService m_GridService; 56 private IGridService m_GridService;
54 57
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
53 get; private set; 53 get; private set;
54 } 54 }
55 55
56 public string ConfigName
57 {
58 get; private set;
59 }
60
61 public bool Enabled 56 public bool Enabled
62 { 57 {
63 get; private set; 58 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
124 public class GridRegion 124 public class GridRegion
125 { 125 {
126 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 126 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
127
128#pragma warning disable 414
127 private static readonly string LogHeader = "[GRID REGION]"; 129 private static readonly string LogHeader = "[GRID REGION]";
130#pragma warning restore 414
128 131
129 /// <summary> 132 /// <summary>
130 /// The port by which http communication occurs with the region 133 /// 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
939 if (!keyValue.EndsWith("/")) 939 if (!keyValue.EndsWith("/"))
940 keyValue = keyValue + "/"; 940 keyValue = keyValue + "/";
941 941
942 if (!account.ServiceURLs.ContainsKey(keyName) || (account.ServiceURLs.ContainsKey(keyName) && account.ServiceURLs[keyName] != keyValue)) 942 if (!account.ServiceURLs.ContainsKey(keyName) || (account.ServiceURLs.ContainsKey(keyName) && (string)account.ServiceURLs[keyName] != keyValue))
943 { 943 {
944 account.ServiceURLs[keyName] = keyValue; 944 account.ServiceURLs[keyName] = keyValue;
945 newUrls = true; 945 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;
37using OpenMetaverse; 37using OpenMetaverse;
38using OpenMetaverse.StructuredData; 38using OpenMetaverse.StructuredData;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Services.UserAccountService;
41 40
42namespace OpenSim.Services.ProfilesService 41namespace OpenSim.Services.ProfilesService
43{ 42{
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
94 94
95 public Type ReplaceableInterface { get { return null; } } 95 public Type ReplaceableInterface { get { return null; } }
96 96
97#pragma warning disable 0067
97 public event ScriptRemoved OnScriptRemoved; 98 public event ScriptRemoved OnScriptRemoved;
98 public event ObjectRemoved OnObjectRemoved; 99 public event ObjectRemoved OnObjectRemoved;
100#pragma warning restore 0067
99 101
100 public string GetXMLState (UUID itemID) 102 public string GetXMLState (UUID itemID)
101 { 103 {
@@ -263,4 +265,4 @@ namespace OpenSim.Tests.Common
263 PostedEvents.Clear(); 265 PostedEvents.Clear();
264 } 266 }
265 } 267 }
266} \ No newline at end of file 268}