diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs | 10 | ||||
-rw-r--r-- | OpenSim/Framework/Capabilities/Caps.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs index 9497a2e..6ab1b58 100644 --- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs +++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs | |||
@@ -63,11 +63,11 @@ namespace OpenSim.Framework.AssetLoader.Filesystem | |||
63 | 63 | ||
64 | protected static void LoadAsset(AssetBase info, string path) | 64 | protected static void LoadAsset(AssetBase info, string path) |
65 | { | 65 | { |
66 | bool image = | 66 | // bool image = |
67 | (info.Type == (sbyte)AssetType.Texture || | 67 | // (info.Type == (sbyte)AssetType.Texture || |
68 | info.Type == (sbyte)AssetType.TextureTGA || | 68 | // info.Type == (sbyte)AssetType.TextureTGA || |
69 | info.Type == (sbyte)AssetType.ImageJPEG || | 69 | // info.Type == (sbyte)AssetType.ImageJPEG || |
70 | info.Type == (sbyte)AssetType.ImageTGA); | 70 | // info.Type == (sbyte)AssetType.ImageTGA); |
71 | 71 | ||
72 | FileInfo fInfo = new FileInfo(path); | 72 | FileInfo fInfo = new FileInfo(path); |
73 | long numBytes = fInfo.Length; | 73 | long numBytes = fInfo.Length; |
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs index 72231ca..1f1ac78 100644 --- a/OpenSim/Framework/Capabilities/Caps.cs +++ b/OpenSim/Framework/Capabilities/Caps.cs | |||
@@ -89,7 +89,7 @@ namespace OpenSim.Framework.Capabilities | |||
89 | //private static readonly string m_requestTexture = "0003/"; | 89 | //private static readonly string m_requestTexture = "0003/"; |
90 | private static readonly string m_notecardUpdatePath = "0004/"; | 90 | private static readonly string m_notecardUpdatePath = "0004/"; |
91 | private static readonly string m_notecardTaskUpdatePath = "0005/"; | 91 | private static readonly string m_notecardTaskUpdatePath = "0005/"; |
92 | private static readonly string m_fetchInventoryPath = "0006/"; | 92 | // private static readonly string m_fetchInventoryPath = "0006/"; |
93 | 93 | ||
94 | // The following entries are in a module, however, they are also here so that we don't re-assign | 94 | // The following entries are in a module, however, they are also here so that we don't re-assign |
95 | // the path to another cap by mistake. | 95 | // the path to another cap by mistake. |
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs index dedf876..b9d3f22 100644 --- a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs +++ b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs | |||
@@ -48,7 +48,7 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
48 | { | 48 | { |
49 | public class MessageRegionModule : IMessageRegionLookup | 49 | public class MessageRegionModule : IMessageRegionLookup |
50 | { | 50 | { |
51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 51 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
52 | 52 | ||
53 | private MessageServerConfig m_cfg; | 53 | private MessageServerConfig m_cfg; |
54 | 54 | ||