diff options
| author | Justin Clark-Casey (justincc) | 2012-03-20 23:19:11 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-03-20 23:19:11 +0000 |
| commit | c39fba8f9dbf2d003d16d1b7583b529a49a39aab (patch) | |
| tree | 80430365f51eb70f184b6798a8f14316ec37eb04 | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-c39fba8f9dbf2d003d16d1b7583b529a49a39aab.zip opensim-SC_OLD-c39fba8f9dbf2d003d16d1b7583b529a49a39aab.tar.gz opensim-SC_OLD-c39fba8f9dbf2d003d16d1b7583b529a49a39aab.tar.bz2 opensim-SC_OLD-c39fba8f9dbf2d003d16d1b7583b529a49a39aab.tar.xz | |
minor: remove some mono compiler warnings
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 35cb575..ed3430a 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
| @@ -761,7 +761,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 761 | SceneObjectPart part = m_Scene.GetSceneObjectPart(objectID); | 761 | SceneObjectPart part = m_Scene.GetSceneObjectPart(objectID); |
| 762 | if (part != null) | 762 | if (part != null) |
| 763 | { | 763 | { |
| 764 | TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(notecardID); | 764 | // TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(notecardID); |
| 765 | if (!m_Scene.Permissions.CanCopyObjectInventory(notecardID, objectID, m_HostCapsObj.AgentID)) | 765 | if (!m_Scene.Permissions.CanCopyObjectInventory(notecardID, objectID, m_HostCapsObj.AgentID)) |
| 766 | { | 766 | { |
| 767 | return LLSDHelpers.SerialiseLLSDReply(response); | 767 | return LLSDHelpers.SerialiseLLSDReply(response); |
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs index 295e868..579d41c 100644 --- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | |||
| @@ -120,7 +120,7 @@ namespace OpenSim.Data.Null | |||
| 120 | /// </summary> | 120 | /// </summary> |
| 121 | public class NullDataStore : ISimulationDataStore | 121 | public class NullDataStore : ISimulationDataStore |
| 122 | { | 122 | { |
| 123 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 123 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 124 | 124 | ||
| 125 | protected Dictionary<UUID, RegionSettings> m_regionSettings = new Dictionary<UUID, RegionSettings>(); | 125 | protected Dictionary<UUID, RegionSettings> m_regionSettings = new Dictionary<UUID, RegionSettings>(); |
| 126 | protected Dictionary<UUID, SceneObjectPart> m_sceneObjectParts = new Dictionary<UUID, SceneObjectPart>(); | 126 | protected Dictionary<UUID, SceneObjectPart> m_sceneObjectParts = new Dictionary<UUID, SceneObjectPart>(); |