aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2011-11-28 11:06:38 +0000
committerMelanie2011-11-28 11:06:38 +0000
commitdc612d0f08ff8740c1942270f22eb79f0310c8fd (patch)
tree4c621d499eecbc176c6eb28a4bad4f8f4872e7f5 /OpenSim/Framework
parentMerge branch 'master' into bigmerge (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-dc612d0f08ff8740c1942270f22eb79f0310c8fd.zip
opensim-SC_OLD-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.gz
opensim-SC_OLD-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.bz2
opensim-SC_OLD-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.xz
Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Console/CommandConsole.cs2
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs57
-rw-r--r--OpenSim/Framework/WebUtil.cs2
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);