ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Won't actually fix anything, since we were handling the problem anyway
* Also add more doc, fix up debugging messages, etc
This commit is contained in:
Justin Clarke Casey
2008-04-11 20:37:26 +00:00
parent 8f345d36d8
commit b3f783ae05
4 changed files with 48 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
OpenSim/Framework/InventoryCollection.cs
View File

@@ -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;
}
}

11
OpenSim/Framework/Servers/RestObjectPosterResponse.cs
View File

@@ -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)
{