Added some extra debug console output to Inventory Server and region OGS1 inventory requests.
							parent
							
								
									0a4a5bbcef
								
							
						
					
					
						commit
						1173a14fbf
					
				| 
						 | 
					@ -74,6 +74,7 @@ namespace OpenSim.Grid.InventoryServer
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public InventoryCollection GetUserInventory(Guid rawUserID)
 | 
					        public InventoryCollection GetUserInventory(Guid rawUserID)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
 | 
					            Console.WriteLine("Request for Inventory for " + rawUserID.ToString());
 | 
				
			||||||
            LLUUID userID = new LLUUID(rawUserID);
 | 
					            LLUUID userID = new LLUUID(rawUserID);
 | 
				
			||||||
            
 | 
					            
 | 
				
			||||||
            InventoryCollection invCollection = new InventoryCollection();
 | 
					            InventoryCollection invCollection = new InventoryCollection();
 | 
				
			||||||
| 
						 | 
					@ -117,6 +118,7 @@ namespace OpenSim.Grid.InventoryServer
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public bool AddInventoryItem( InventoryItemBase item)
 | 
					        public bool AddInventoryItem( InventoryItemBase item)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
 | 
					            Console.WriteLine("creating new item for " + item.avatarID.ToString());
 | 
				
			||||||
            AddNewInventoryItem(item.avatarID, item);
 | 
					            AddNewInventoryItem(item.avatarID, item);
 | 
				
			||||||
            return true;
 | 
					            return true;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -63,10 +63,12 @@ namespace OpenSim.Region.Communications.OGS1
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            try
 | 
					            try
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
            RestObjectPosterResponse<InventoryCollection> requester = new RestObjectPosterResponse<InventoryCollection>();
 | 
					                Console.WriteLine("Requesting Inventory from Inventory server for " + userID.ToStringHyphenated());
 | 
				
			||||||
            requester.ResponseCallback = InventoryResponse;
 | 
					                RestObjectPosterResponse<InventoryCollection> requester = new RestObjectPosterResponse<InventoryCollection>();
 | 
				
			||||||
            
 | 
					                requester.ResponseCallback = InventoryResponse;
 | 
				
			||||||
            requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID);
 | 
					
 | 
				
			||||||
 | 
					                requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID);
 | 
				
			||||||
 | 
					                Console.WriteLine("Request for Inventory sent");
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            catch (Exception)
 | 
					            catch (Exception)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
| 
						 | 
					@ -78,7 +80,7 @@ namespace OpenSim.Region.Communications.OGS1
 | 
				
			||||||
            LLUUID userID = response.UserID;
 | 
					            LLUUID userID = response.UserID;
 | 
				
			||||||
            if (m_RequestingInventory.ContainsKey(userID))
 | 
					            if (m_RequestingInventory.ContainsKey(userID))
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                
 | 
					
 | 
				
			||||||
                InventoryFolderImpl rootFolder = null;
 | 
					                InventoryFolderImpl rootFolder = null;
 | 
				
			||||||
                InventoryRequest request = m_RequestingInventory[userID];
 | 
					                InventoryRequest request = m_RequestingInventory[userID];
 | 
				
			||||||
                foreach (InventoryFolderBase folder in response.Folders)
 | 
					                foreach (InventoryFolderBase folder in response.Folders)
 | 
				
			||||||
| 
						 | 
					@ -126,7 +128,7 @@ namespace OpenSim.Region.Communications.OGS1
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            try
 | 
					            try
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
            RestObjectPoster.BeginPostObject<InventoryItemBase>(_inventoryServerUrl + "/NewItem/", item);
 | 
					                RestObjectPoster.BeginPostObject<InventoryItemBase>(_inventoryServerUrl + "/NewItem/", item);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            catch (Exception)
 | 
					            catch (Exception)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
| 
						 | 
					@ -136,8 +138,8 @@ namespace OpenSim.Region.Communications.OGS1
 | 
				
			||||||
        public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)
 | 
					        public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            try
 | 
					            try
 | 
				
			||||||
            { 
 | 
					            {
 | 
				
			||||||
            RestObjectPoster.BeginPostObject<InventoryItemBase>(_inventoryServerUrl + "/DeleteItem/", item);
 | 
					                RestObjectPoster.BeginPostObject<InventoryItemBase>(_inventoryServerUrl + "/DeleteItem/", item);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            catch (Exception)
 | 
					            catch (Exception)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue