diff options
| author | Melanie | 2012-07-01 03:04:23 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-01 03:04:23 +0100 |
| commit | e5eef139ede23f73c3aaccfc54084dfe81bd891a (patch) | |
| tree | 41058b7c930f87652bc03b60a9e53c041f13ebc9 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove some mono compiler warnings (diff) | |
| download | opensim-SC-e5eef139ede23f73c3aaccfc54084dfe81bd891a.zip opensim-SC-e5eef139ede23f73c3aaccfc54084dfe81bd891a.tar.gz opensim-SC-e5eef139ede23f73c3aaccfc54084dfe81bd891a.tar.bz2 opensim-SC-e5eef139ede23f73c3aaccfc54084dfe81bd891a.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Serialization/External/LandDataSerializer.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs index a12877a..e8d82d3 100644 --- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs +++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs | |||
| @@ -42,7 +42,7 @@ namespace OpenSim.Framework.Serialization.External | |||
| 42 | /// </summary> | 42 | /// </summary> |
| 43 | public class LandDataSerializer | 43 | public class LandDataSerializer |
| 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 | 46 | ||
| 47 | protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding(); | 47 | protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding(); |
| 48 | 48 | ||
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs index 57da7ca..88f9581 100644 --- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs +++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs | |||
| @@ -44,7 +44,7 @@ namespace OpenSim.Framework.Serialization.External | |||
| 44 | /// </summary> | 44 | /// </summary> |
| 45 | public class UserInventoryItemSerializer | 45 | public class UserInventoryItemSerializer |
| 46 | { | 46 | { |
| 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 48 | 48 | ||
| 49 | private static Dictionary<string, Action<InventoryItemBase, XmlTextReader>> m_InventoryItemXmlProcessors | 49 | private static Dictionary<string, Action<InventoryItemBase, XmlTextReader>> m_InventoryItemXmlProcessors |
| 50 | = new Dictionary<string, Action<InventoryItemBase, XmlTextReader>>(); | 50 | = new Dictionary<string, Action<InventoryItemBase, XmlTextReader>>(); |