* Reduce publicly exposed fields on InventoryCollection, which was causing duplicate sets of inventory data to be sent over the grid

* Won't actually fix anything, since we were handling the problem anyway
* Also add more doc, fix up debugging messages, etc

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
     /// </summary>
     public class InventoryCollection
     {
-        public List<InventoryFolderBase> _folders;
-        public List<InventoryItemBase> _allItems;
-        public LLUUID _userID;
-        
-        public List<InventoryFolderBase> Folders {
-                get {
-                        return _folders;
-                }
-                set {
-                        _folders = value;
-                }
-        }
-
-        public List<InventoryItemBase> AllItems {
-                get {
-                        return _allItems;
-                }
-                set {
-                        _allItems = value;
-                }
-        }
-
-        public LLUUID UserID {
-                get {
-                        return _userID;
-                }
-                set {
-                        _userID = value;
-                }
-        }
-
-        public InventoryCollection()
-        {
-            _folders = new List<InventoryFolderBase>();
-            _allItems = new List<InventoryItemBase>();
-        }
-
-        public InventoryCollection(List<InventoryFolderBase> folders, List<InventoryItemBase> allItems)
-        {
-            _folders = folders;
-            _allItems = allItems;
-        }
+        public List<InventoryFolderBase> Folders;
+        public List<InventoryItemBase> Items;
+        public LLUUID UserID;
     }
 }
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
     /// </summary>    
     public class RestObjectPosterResponse<TResponse>
     {
+//        private static readonly log4net.ILog m_log 
+//            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        
         public ReturnResponse<TResponse> ResponseCallback;
 
         public void BeginPostObject<TRequest>(string requestUrl, TRequest obj)
@@ -83,7 +86,13 @@ namespace OpenSim.Framework.Servers
             {
                 TResponse deserial;
                 XmlSerializer deserializer = new XmlSerializer(typeof (TResponse));
-                deserial = (TResponse) deserializer.Deserialize(resp.GetResponseStream());
+                Stream stream = resp.GetResponseStream();
+                
+                // This is currently a bad debug stanza since it gobbles us the response...
+//                StreamReader reader = new StreamReader(stream);
+//                m_log.DebugFormat("[REST OBJECT POSTER RESPONSE]: Received {0}", reader.ReadToEnd());
+                
+                deserial = (TResponse) deserializer.Deserialize(stream);
 
                 if (deserial != null && ResponseCallback != null)
                 {