aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/InventoryCollection.cs45
-rw-r--r--OpenSim/Framework/Servers/RestObjectPosterResponse.cs11
2 files changed, 13 insertions, 43 deletions
diff --git a/OpenSim/Framework/InventoryCollection.cs b/OpenSim/Framework/InventoryCollection.cs
index e76e1a9..abccf49 100644
--- a/OpenSim/Framework/InventoryCollection.cs
+++ b/OpenSim/Framework/InventoryCollection.cs
@@ -37,47 +37,8 @@ namespace OpenSim.Framework
37 /// </summary> 37 /// </summary>
38 public class InventoryCollection 38 public class InventoryCollection
39 { 39 {
40 public List<InventoryFolderBase> _folders; 40 public List<InventoryFolderBase> Folders;
41 public List<InventoryItemBase> _allItems; 41 public List<InventoryItemBase> Items;
42 public LLUUID _userID; 42 public LLUUID UserID;
43
44 public List<InventoryFolderBase> Folders {
45 get {
46 return _folders;
47 }
48 set {
49 _folders = value;
50 }
51 }
52
53 public List<InventoryItemBase> AllItems {
54 get {
55 return _allItems;
56 }
57 set {
58 _allItems = value;
59 }
60 }
61
62 public LLUUID UserID {
63 get {
64 return _userID;
65 }
66 set {
67 _userID = value;
68 }
69 }
70
71 public InventoryCollection()
72 {
73 _folders = new List<InventoryFolderBase>();
74 _allItems = new List<InventoryItemBase>();
75 }
76
77 public InventoryCollection(List<InventoryFolderBase> folders, List<InventoryItemBase> allItems)
78 {
79 _folders = folders;
80 _allItems = allItems;
81 }
82 } 43 }
83} 44}
diff --git a/OpenSim/Framework/Servers/RestObjectPosterResponse.cs b/OpenSim/Framework/Servers/RestObjectPosterResponse.cs
index 1d99a80..1410afd 100644
--- a/OpenSim/Framework/Servers/RestObjectPosterResponse.cs
+++ b/OpenSim/Framework/Servers/RestObjectPosterResponse.cs
@@ -41,6 +41,9 @@ namespace OpenSim.Framework.Servers
41 /// </summary> 41 /// </summary>
42 public class RestObjectPosterResponse<TResponse> 42 public class RestObjectPosterResponse<TResponse>
43 { 43 {
44// private static readonly log4net.ILog m_log
45// = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
46
44 public ReturnResponse<TResponse> ResponseCallback; 47 public ReturnResponse<TResponse> ResponseCallback;
45 48
46 public void BeginPostObject<TRequest>(string requestUrl, TRequest obj) 49 public void BeginPostObject<TRequest>(string requestUrl, TRequest obj)
@@ -83,7 +86,13 @@ namespace OpenSim.Framework.Servers
83 { 86 {
84 TResponse deserial; 87 TResponse deserial;
85 XmlSerializer deserializer = new XmlSerializer(typeof (TResponse)); 88 XmlSerializer deserializer = new XmlSerializer(typeof (TResponse));
86 deserial = (TResponse) deserializer.Deserialize(resp.GetResponseStream()); 89 Stream stream = resp.GetResponseStream();
90
91 // This is currently a bad debug stanza since it gobbles us the response...
92// StreamReader reader = new StreamReader(stream);
93// m_log.DebugFormat("[REST OBJECT POSTER RESPONSE]: Received {0}", reader.ReadToEnd());
94
95 deserial = (TResponse) deserializer.Deserialize(stream);
87 96
88 if (deserial != null && ResponseCallback != null) 97 if (deserial != null && ResponseCallback != null)
89 { 98 {