diff options
author | Oren Hurvitz | 2014-04-22 20:04:12 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-23 16:37:36 +0300 |
commit | 998d7009a65def0a4debc9369d35b63611db5b55 (patch) | |
tree | d1303dc0387ae9ce4ddb076d5ccc856f3d5844e0 /OpenSim/Region/CoreModules/Avatar | |
parent | Workaround for SRAS: if Store Asset returns 'null' then assume the asset alre... (diff) | |
download | opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.zip opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.gz opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.bz2 opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.xz |
Eliminated many warnings
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs | 2 |
2 files changed, 3 insertions, 1 deletions
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 | ||