diff options
author | Oren Hurvitz | 2014-07-21 10:25:47 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-07-21 08:30:10 +0100 |
commit | 9fa8d8459838848354d703a37666983f19a06ca0 (patch) | |
tree | 81b35a441bbb0095cb90caad0ab305fb4fb41cfa | |
parent | Close streams immediately when we finish using them (diff) | |
download | opensim-SC_OLD-9fa8d8459838848354d703a37666983f19a06ca0.zip opensim-SC_OLD-9fa8d8459838848354d703a37666983f19a06ca0.tar.gz opensim-SC_OLD-9fa8d8459838848354d703a37666983f19a06ca0.tar.bz2 opensim-SC_OLD-9fa8d8459838848354d703a37666983f19a06ca0.tar.xz |
Eliminated some warnings
3 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 238aff4..e9e81f5 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -546,7 +546,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
546 | if (texture_list.Count > 0) | 546 | if (texture_list.Count > 0) |
547 | { | 547 | { |
548 | ScenePresence avatar = null; | 548 | ScenePresence avatar = null; |
549 | IClientAPI client = null; | ||
550 | m_Scene.TryGetScenePresence(m_HostCapsObj.AgentID, out avatar); | 549 | m_Scene.TryGetScenePresence(m_HostCapsObj.AgentID, out avatar); |
551 | 550 | ||
552 | if (avatar != null) | 551 | if (avatar != null) |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs index 388de7f..b476e32 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs | |||
@@ -48,7 +48,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests | |||
48 | private string m_testDir; | 48 | private string m_testDir; |
49 | private CSharpCodeProvider m_CSCodeProvider; | 49 | private CSharpCodeProvider m_CSCodeProvider; |
50 | private CompilerParameters m_compilerParameters; | 50 | private CompilerParameters m_compilerParameters; |
51 | private CompilerResults m_compilerResults; | 51 | // private CompilerResults m_compilerResults; |
52 | private ResolveEventHandler m_resolveEventHandler; | 52 | private ResolveEventHandler m_resolveEventHandler; |
53 | 53 | ||
54 | /// <summary> | 54 | /// <summary> |
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs index 0e425f8..c07e034 100644 --- a/OpenSim/Services/MapImageService/MapImageService.cs +++ b/OpenSim/Services/MapImageService/MapImageService.cs | |||
@@ -54,7 +54,9 @@ namespace OpenSim.Services.MapImageService | |||
54 | private static readonly ILog m_log = | 54 | private static readonly ILog m_log = |
55 | LogManager.GetLogger( | 55 | LogManager.GetLogger( |
56 | MethodBase.GetCurrentMethod().DeclaringType); | 56 | MethodBase.GetCurrentMethod().DeclaringType); |
57 | #pragma warning disable 414 | ||
57 | private string LogHeader = "[MAP IMAGE SERVICE]"; | 58 | private string LogHeader = "[MAP IMAGE SERVICE]"; |
59 | #pragma warning restore 414 | ||
58 | 60 | ||
59 | private const int ZOOM_LEVELS = 8; | 61 | private const int ZOOM_LEVELS = 8; |
60 | private const int IMAGE_WIDTH = 256; | 62 | private const int IMAGE_WIDTH = 256; |