aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs18
2 files changed, 12 insertions, 8 deletions
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index c6d3302..8756ecb 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -74,6 +74,7 @@ namespace OpenSim.Grid.InventoryServer
74 74
75 public InventoryCollection GetUserInventory(Guid rawUserID) 75 public InventoryCollection GetUserInventory(Guid rawUserID)
76 { 76 {
77 Console.WriteLine("Request for Inventory for " + rawUserID.ToString());
77 LLUUID userID = new LLUUID(rawUserID); 78 LLUUID userID = new LLUUID(rawUserID);
78 79
79 InventoryCollection invCollection = new InventoryCollection(); 80 InventoryCollection invCollection = new InventoryCollection();
@@ -117,6 +118,7 @@ namespace OpenSim.Grid.InventoryServer
117 118
118 public bool AddInventoryItem( InventoryItemBase item) 119 public bool AddInventoryItem( InventoryItemBase item)
119 { 120 {
121 Console.WriteLine("creating new item for " + item.avatarID.ToString());
120 AddNewInventoryItem(item.avatarID, item); 122 AddNewInventoryItem(item.avatarID, item);
121 return true; 123 return true;
122 } 124 }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 5342127..9633963 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -63,10 +63,12 @@ namespace OpenSim.Region.Communications.OGS1
63 { 63 {
64 try 64 try
65 { 65 {
66 RestObjectPosterResponse<InventoryCollection> requester = new RestObjectPosterResponse<InventoryCollection>(); 66 Console.WriteLine("Requesting Inventory from Inventory server for " + userID.ToStringHyphenated());
67 requester.ResponseCallback = InventoryResponse; 67 RestObjectPosterResponse<InventoryCollection> requester = new RestObjectPosterResponse<InventoryCollection>();
68 68 requester.ResponseCallback = InventoryResponse;
69 requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID); 69
70 requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID);
71 Console.WriteLine("Request for Inventory sent");
70 } 72 }
71 catch (Exception) 73 catch (Exception)
72 { 74 {
@@ -78,7 +80,7 @@ namespace OpenSim.Region.Communications.OGS1
78 LLUUID userID = response.UserID; 80 LLUUID userID = response.UserID;
79 if (m_RequestingInventory.ContainsKey(userID)) 81 if (m_RequestingInventory.ContainsKey(userID))
80 { 82 {
81 83
82 InventoryFolderImpl rootFolder = null; 84 InventoryFolderImpl rootFolder = null;
83 InventoryRequest request = m_RequestingInventory[userID]; 85 InventoryRequest request = m_RequestingInventory[userID];
84 foreach (InventoryFolderBase folder in response.Folders) 86 foreach (InventoryFolderBase folder in response.Folders)
@@ -126,7 +128,7 @@ namespace OpenSim.Region.Communications.OGS1
126 { 128 {
127 try 129 try
128 { 130 {
129 RestObjectPoster.BeginPostObject<InventoryItemBase>(_inventoryServerUrl + "/NewItem/", item); 131 RestObjectPoster.BeginPostObject<InventoryItemBase>(_inventoryServerUrl + "/NewItem/", item);
130 } 132 }
131 catch (Exception) 133 catch (Exception)
132 { 134 {
@@ -136,8 +138,8 @@ namespace OpenSim.Region.Communications.OGS1
136 public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item) 138 public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)
137 { 139 {
138 try 140 try
139 { 141 {
140 RestObjectPoster.BeginPostObject<InventoryItemBase>(_inventoryServerUrl + "/DeleteItem/", item); 142 RestObjectPoster.BeginPostObject<InventoryItemBase>(_inventoryServerUrl + "/DeleteItem/", item);
141 } 143 }
142 catch (Exception) 144 catch (Exception)
143 { 145 {