diff options
author | Justin Clarke Casey | 2009-05-04 15:38:36 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-05-04 15:38:36 +0000 |
commit | 257fc5515ac9cb36032c2f44f040c3620ed2f328 (patch) | |
tree | 167d99d28167e6ab36a96bccf22fbef0b9f0cce1 /OpenSim/Framework | |
parent | Prebuild changes to allow the console to reference the http server (diff) | |
download | opensim-SC_OLD-257fc5515ac9cb36032c2f44f040c3620ed2f328.zip opensim-SC_OLD-257fc5515ac9cb36032c2f44f040c3620ed2f328.tar.gz opensim-SC_OLD-257fc5515ac9cb36032c2f44f040c3620ed2f328.tar.bz2 opensim-SC_OLD-257fc5515ac9cb36032c2f44f040c3620ed2f328.tar.xz |
* minor: remove some mono compiler warnings, minor cleanup
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Console/ConsoleBase.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Console/LocalConsole.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Console/RemoteConsole.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/InventoryItemBase.cs | 13 |
4 files changed, 15 insertions, 4 deletions
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs index 30493fc..dd3c145 100644 --- a/OpenSim/Framework/Console/ConsoleBase.cs +++ b/OpenSim/Framework/Console/ConsoleBase.cs | |||
@@ -37,7 +37,7 @@ namespace OpenSim.Framework.Console | |||
37 | { | 37 | { |
38 | public class ConsoleBase | 38 | public class ConsoleBase |
39 | { | 39 | { |
40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
41 | 41 | ||
42 | protected string prompt = "# "; | 42 | protected string prompt = "# "; |
43 | 43 | ||
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs index 2344ad2..22f10fc 100644 --- a/OpenSim/Framework/Console/LocalConsole.cs +++ b/OpenSim/Framework/Console/LocalConsole.cs | |||
@@ -39,7 +39,7 @@ namespace OpenSim.Framework.Console | |||
39 | // | 39 | // |
40 | public class LocalConsole : CommandConsole | 40 | public class LocalConsole : CommandConsole |
41 | { | 41 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | 43 | ||
44 | private readonly object m_syncRoot = new object(); | 44 | private readonly object m_syncRoot = new object(); |
45 | 45 | ||
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs index 71f075e..19c3ab1 100644 --- a/OpenSim/Framework/Console/RemoteConsole.cs +++ b/OpenSim/Framework/Console/RemoteConsole.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Console | |||
41 | // | 41 | // |
42 | public class RemoteConsole : CommandConsole | 42 | public class RemoteConsole : CommandConsole |
43 | { | 43 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | private IHttpServer m_Server = null; | 46 | private IHttpServer m_Server = null; |
47 | private IConfigSource m_Config = null; | 47 | private IConfigSource m_Config = null; |
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs index ce3dc63..b14ce7f 100644 --- a/OpenSim/Framework/InventoryItemBase.cs +++ b/OpenSim/Framework/InventoryItemBase.cs | |||
@@ -33,7 +33,7 @@ namespace OpenSim.Framework | |||
33 | /// <summary> | 33 | /// <summary> |
34 | /// Inventory Item - contains all the properties associated with an individual inventory piece. | 34 | /// Inventory Item - contains all the properties associated with an individual inventory piece. |
35 | /// </summary> | 35 | /// </summary> |
36 | public class InventoryItemBase : InventoryNodeBase | 36 | public class InventoryItemBase : InventoryNodeBase, ICloneable |
37 | { | 37 | { |
38 | /// <summary> | 38 | /// <summary> |
39 | /// The inventory type of the item. This is slightly different from the asset type in some situations. | 39 | /// The inventory type of the item. This is slightly different from the asset type in some situations. |
@@ -143,5 +143,16 @@ namespace OpenSim.Framework | |||
143 | { | 143 | { |
144 | CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; | 144 | CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; |
145 | } | 145 | } |
146 | |||
147 | public object Clone() | ||
148 | { | ||
149 | InventoryItemBase clone = new InventoryItemBase(); | ||
150 | clone.AssetID = AssetID; | ||
151 | clone.AssetType = AssetType; | ||
152 | clone.BasePermissions = BasePermissions; | ||
153 | clone.CreationDate = CreationDate; | ||
154 | clone.CreatorId = CreatorId; | ||
155 | |||
156 | } | ||
146 | } | 157 | } |
147 | } | 158 | } |