diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Console/CommandConsole.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/TaskInventoryItem.cs | 57 | ||||
-rw-r--r-- | OpenSim/Framework/WebUtil.cs | 2 |
3 files changed, 2 insertions, 59 deletions
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs index f10b857..a0d3541 100644 --- a/OpenSim/Framework/Console/CommandConsole.cs +++ b/OpenSim/Framework/Console/CommandConsole.cs | |||
@@ -565,7 +565,7 @@ namespace OpenSim.Framework.Console | |||
565 | /// </summary> | 565 | /// </summary> |
566 | public class CommandConsole : ConsoleBase, ICommandConsole | 566 | public class CommandConsole : ConsoleBase, ICommandConsole |
567 | { | 567 | { |
568 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 568 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
569 | 569 | ||
570 | public ICommands Commands { get; private set; } | 570 | public ICommands Commands { get; private set; } |
571 | 571 | ||
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs index be2b8c8..fa514f0 100644 --- a/OpenSim/Framework/TaskInventoryItem.cs +++ b/OpenSim/Framework/TaskInventoryItem.cs | |||
@@ -40,63 +40,6 @@ namespace OpenSim.Framework | |||
40 | /// </summary> | 40 | /// </summary> |
41 | private const uint FULL_MASK_PERMISSIONS_GENERAL = 2147483647; | 41 | private const uint FULL_MASK_PERMISSIONS_GENERAL = 2147483647; |
42 | 42 | ||
43 | /// <summary> | ||
44 | /// Inventory types | ||
45 | /// </summary> | ||
46 | public static string[] InvTypes = new string[] | ||
47 | { | ||
48 | "texture", | ||
49 | "sound", | ||
50 | "calling_card", | ||
51 | "landmark", | ||
52 | String.Empty, | ||
53 | String.Empty, | ||
54 | "object", | ||
55 | "notecard", | ||
56 | String.Empty, | ||
57 | String.Empty, | ||
58 | "lsl_text", | ||
59 | String.Empty, | ||
60 | String.Empty, | ||
61 | "bodypart", | ||
62 | String.Empty, | ||
63 | "snapshot", | ||
64 | String.Empty, | ||
65 | String.Empty, | ||
66 | "wearable", | ||
67 | "animation", | ||
68 | "gesture" | ||
69 | }; | ||
70 | |||
71 | /// <summary> | ||
72 | /// Asset types | ||
73 | /// </summary> | ||
74 | public static string[] Types = new string[] | ||
75 | { | ||
76 | "texture", | ||
77 | "sound", | ||
78 | "callcard", | ||
79 | "landmark", | ||
80 | "clothing", // Deprecated | ||
81 | "clothing", | ||
82 | "object", | ||
83 | "notecard", | ||
84 | "category", | ||
85 | "root", | ||
86 | "lsltext", | ||
87 | "lslbyte", | ||
88 | "txtr_tga", | ||
89 | "bodypart", | ||
90 | "trash", | ||
91 | "snapshot", | ||
92 | "lstndfnd", | ||
93 | "snd_wav", | ||
94 | "img_tga", | ||
95 | "jpeg", | ||
96 | "animatn", | ||
97 | "gesture" | ||
98 | }; | ||
99 | |||
100 | private UUID _assetID = UUID.Zero; | 43 | private UUID _assetID = UUID.Zero; |
101 | 44 | ||
102 | private uint _baseMask = FULL_MASK_PERMISSIONS_GENERAL; | 45 | private uint _baseMask = FULL_MASK_PERMISSIONS_GENERAL; |
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index 6ce122b..854f310 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
@@ -295,7 +295,7 @@ namespace OpenSim.Framework | |||
295 | return result; | 295 | return result; |
296 | } | 296 | } |
297 | } | 297 | } |
298 | catch (Exception e) | 298 | catch |
299 | { | 299 | { |
300 | // don't need to treat this as an error... we're just guessing anyway | 300 | // don't need to treat this as an error... we're just guessing anyway |
301 | // m_log.DebugFormat("[WEB UTIL] couldn't decode <{0}>: {1}",response,e.Message); | 301 | // m_log.DebugFormat("[WEB UTIL] couldn't decode <{0}>: {1}",response,e.Message); |