diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs index 29def9e2ad..1f44686d3c 100644 --- a/OpenSim/Grid/AssetServer/RestService.cs +++ b/OpenSim/Grid/AssetServer/RestService.cs @@ -54,14 +54,7 @@ namespace OpenSim.Grid.AssetServer if (p.Length > 0) { - LLUUID assetID; - bool isTexture = false; - LLUUID.TryParse(p[0], out assetID); - if (p.Length > 1) - { - if (string.Compare(p[1], "texture", true) == 0) - isTexture = true; - } + LLUUID assetID = LLUUID.Parse(p[0]); MainLog.Instance.Verbose("REST", "GET:/asset fetch param={0} UUID={1}", param, assetID); AssetBase asset = m_assetProvider.FetchAsset(assetID); diff --git a/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs index dc4ef352b1..d47004b6c6 100644 --- a/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs +++ b/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs @@ -342,7 +342,7 @@ namespace OpenSim.Region.Environment.Modules { httpThread.Abort(); } - catch (Exception e) { } + catch (Exception) { } } } diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs index f139d64304..f13b2bb31b 100644 --- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs +++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs @@ -100,11 +100,9 @@ namespace OpenSim.Region.Environment.Modules { try { - m_remoteDataPort = config.Configs["Network"].GetInt("remoteDataPort", m_remoteDataPort); - } - catch (Exception e) + catch (Exception) { } diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index bf47277b6e..86ff65ec3b 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -63,7 +63,6 @@ namespace OpenSim.Region.Environment.Scenes // Agent moves with a PID controller causing a force to be exerted. private bool m_newForce = false; - private bool m_newAvatar = false; private bool m_newCoarseLocations = true; private bool m_gotAllObjectsInScene = false; @@ -457,7 +456,6 @@ namespace OpenSim.Region.Environment.Scenes /// public void MakeRootAgent(LLVector3 pos, bool isFlying) { - m_newAvatar = true; m_isChildAgent = false; AbsolutePosition = pos; @@ -1104,7 +1102,6 @@ namespace OpenSim.Region.Environment.Scenes if (!m_isChildAgent) { m_scene.InformClientOfNeighbours(this); - m_newAvatar = false; } SendFullUpdateToAllClients(); diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index a86946ed32..02108d0534 100644 --- a/OpenSim/Region/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs @@ -46,7 +46,7 @@ namespace SimpleApp internal class Program : RegionApplicationBase, conscmd_callback { private ModuleLoader m_moduleLoader; - private IConfigSource m_config; + private IConfigSource m_config = null; private string m_userPlugin = "OpenSim.Framework.Data.SQLite.dll"; private string m_inventoryPlugin = "OpenSim.Framework.Data.SQLite.dll";