diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs index 67f8e80..56e7475 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | |||
@@ -97,14 +97,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
97 | IConfig gridConfig = source.Configs["InventoryService"]; | 97 | IConfig gridConfig = source.Configs["InventoryService"]; |
98 | if (gridConfig == null) | 98 | if (gridConfig == null) |
99 | { | 99 | { |
100 | m_log.Error("[INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini"); | 100 | m_log.Error("[SIMIAN INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini"); |
101 | throw new Exception("Inventory connector init error"); | 101 | throw new Exception("Inventory connector init error"); |
102 | } | 102 | } |
103 | 103 | ||
104 | string serviceUrl = gridConfig.GetString("InventoryServerURI"); | 104 | string serviceUrl = gridConfig.GetString("InventoryServerURI"); |
105 | if (String.IsNullOrEmpty(serviceUrl)) | 105 | if (String.IsNullOrEmpty(serviceUrl)) |
106 | { | 106 | { |
107 | m_log.Error("[INVENTORY CONNECTOR]: No Server URI named in section InventoryService"); | 107 | m_log.Error("[SIMIAN INVENTORY CONNECTOR]: No Server URI named in section InventoryService"); |
108 | throw new Exception("Inventory connector init error"); | 108 | throw new Exception("Inventory connector init error"); |
109 | } | 109 | } |
110 | 110 | ||
@@ -117,11 +117,11 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
117 | if (!String.IsNullOrEmpty(serviceUrl)) | 117 | if (!String.IsNullOrEmpty(serviceUrl)) |
118 | m_userServerUrl = serviceUrl; | 118 | m_userServerUrl = serviceUrl; |
119 | else | 119 | else |
120 | m_log.Info("[INVENTORY CONNECTOR]: No Server URI named in section UserAccountService"); | 120 | m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No Server URI named in section UserAccountService"); |
121 | } | 121 | } |
122 | else | 122 | else |
123 | { | 123 | { |
124 | m_log.Warn("[INVENTORY CONNECTOR]: UserAccountService missing from OpenSim.ini"); | 124 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: UserAccountService missing from OpenSim.ini"); |
125 | } | 125 | } |
126 | } | 126 | } |
127 | } | 127 | } |
@@ -143,7 +143,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
143 | bool success = response["Success"].AsBoolean(); | 143 | bool success = response["Success"].AsBoolean(); |
144 | 144 | ||
145 | if (!success) | 145 | if (!success) |
146 | m_log.Warn("[INVENTORY CONNECTOR]: Inventory creation for " + userID + " failed: " + response["Message"].AsString()); | 146 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Inventory creation for " + userID + " failed: " + response["Message"].AsString()); |
147 | 147 | ||
148 | return success; | 148 | return success; |
149 | } | 149 | } |
@@ -173,7 +173,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
173 | } | 173 | } |
174 | else | 174 | else |
175 | { | 175 | { |
176 | m_log.Warn("[INVENTORY CONNECTOR]: Failed to retrieve inventory skeleton for " + userID + ": " + | 176 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Failed to retrieve inventory skeleton for " + userID + ": " + |
177 | response["Message"].AsString()); | 177 | response["Message"].AsString()); |
178 | return new List<InventoryFolderBase>(0); | 178 | return new List<InventoryFolderBase>(0); |
179 | } | 179 | } |
@@ -187,7 +187,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
187 | [Obsolete] | 187 | [Obsolete] |
188 | public InventoryCollection GetUserInventory(UUID userID) | 188 | public InventoryCollection GetUserInventory(UUID userID) |
189 | { | 189 | { |
190 | m_log.Error("[INVENTORY CONNECTOR]: Obsolete GetUserInventory called for " + userID); | 190 | m_log.Error("[SIMIAN INVENTORY CONNECTOR]: Obsolete GetUserInventory called for " + userID); |
191 | 191 | ||
192 | InventoryCollection inventory = new InventoryCollection(); | 192 | InventoryCollection inventory = new InventoryCollection(); |
193 | inventory.UserID = userID; | 193 | inventory.UserID = userID; |
@@ -206,7 +206,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
206 | [Obsolete] | 206 | [Obsolete] |
207 | public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) | 207 | public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) |
208 | { | 208 | { |
209 | m_log.Error("[INVENTORY CONNECTOR]: Obsolete GetUserInventory called for " + userID); | 209 | m_log.Error("[SIMIAN INVENTORY CONNECTOR]: Obsolete GetUserInventory called for " + userID); |
210 | callback(new List<InventoryFolderImpl>(0), new List<InventoryItemBase>(0)); | 210 | callback(new List<InventoryFolderImpl>(0), new List<InventoryItemBase>(0)); |
211 | } | 211 | } |
212 | 212 | ||
@@ -273,7 +273,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
273 | } | 273 | } |
274 | else | 274 | else |
275 | { | 275 | { |
276 | m_log.Warn("[INVENTORY CONNECTOR]: Default folder not found for content type " + contentType); | 276 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Default folder not found for content type " + contentType + ": " + response["Message"].AsString()); |
277 | return GetRootFolder(userID); | 277 | return GetRootFolder(userID); |
278 | } | 278 | } |
279 | } | 279 | } |
@@ -311,7 +311,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
311 | } | 311 | } |
312 | } | 312 | } |
313 | 313 | ||
314 | m_log.Warn("[INVENTORY CONNECTOR]: Item " + item.ID + " owned by " + item.Owner + " not found"); | 314 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Item " + item.ID + " owned by " + item.Owner + " not found"); |
315 | return null; | 315 | return null; |
316 | } | 316 | } |
317 | 317 | ||
@@ -376,7 +376,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
376 | } | 376 | } |
377 | else | 377 | else |
378 | { | 378 | { |
379 | m_log.Warn("[INVENTORY CONNECTOR]: Error fetching folder " + folderID + " content for " + userID + ": " + | 379 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error fetching folder " + folderID + " content for " + userID + ": " + |
380 | response["Message"].AsString()); | 380 | response["Message"].AsString()); |
381 | inventory.Folders = new List<InventoryFolderBase>(0); | 381 | inventory.Folders = new List<InventoryFolderBase>(0); |
382 | inventory.Items = new List<InventoryItemBase>(0); | 382 | inventory.Items = new List<InventoryItemBase>(0); |
@@ -414,7 +414,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
414 | } | 414 | } |
415 | else | 415 | else |
416 | { | 416 | { |
417 | m_log.Warn("[INVENTORY CONNECTOR]: Error fetching folder " + folderID + " for " + userID + ": " + | 417 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error fetching folder " + folderID + " for " + userID + ": " + |
418 | response["Message"].AsString()); | 418 | response["Message"].AsString()); |
419 | return new List<InventoryItemBase>(0); | 419 | return new List<InventoryItemBase>(0); |
420 | } | 420 | } |
@@ -442,7 +442,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
442 | 442 | ||
443 | if (!success) | 443 | if (!success) |
444 | { | 444 | { |
445 | m_log.Warn("[INVENTORY CONNECTOR]: Error creating folder " + folder.Name + " for " + folder.Owner + ": " + | 445 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error creating folder " + folder.Name + " for " + folder.Owner + ": " + |
446 | response["Message"].AsString()); | 446 | response["Message"].AsString()); |
447 | } | 447 | } |
448 | 448 | ||
@@ -506,7 +506,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
506 | 506 | ||
507 | if (!success) | 507 | if (!success) |
508 | { | 508 | { |
509 | m_log.Warn("[INVENTORY CONNECTOR]: Error removing item " + itemID + " for " + userID + ": " + | 509 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error removing item " + itemID + " for " + userID + ": " + |
510 | response["Message"].AsString()); | 510 | response["Message"].AsString()); |
511 | allSuccess = false; | 511 | allSuccess = false; |
512 | } | 512 | } |
@@ -534,7 +534,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
534 | 534 | ||
535 | if (!success) | 535 | if (!success) |
536 | { | 536 | { |
537 | m_log.Warn("[INVENTORY CONNECTOR]: Error purging folder " + folder.ID + " for " + folder.Owner + ": " + | 537 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error purging folder " + folder.ID + " for " + folder.Owner + ": " + |
538 | response["Message"].AsString()); | 538 | response["Message"].AsString()); |
539 | } | 539 | } |
540 | 540 | ||
@@ -562,7 +562,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
562 | UpdateGesture(item.Owner, item.ID, item.Flags == 1); | 562 | UpdateGesture(item.Owner, item.ID, item.Flags == 1); |
563 | 563 | ||
564 | if (item.BasePermissions == 0) | 564 | if (item.BasePermissions == 0) |
565 | m_log.WarnFormat("[INVENTORY CONNECTOR]: Adding inventory item {0} ({1}) with no base permissions", item.Name, item.ID); | 565 | m_log.WarnFormat("[SIMIAN INVENTORY CONNECTOR]: Adding inventory item {0} ({1}) with no base permissions", item.Name, item.ID); |
566 | 566 | ||
567 | OSDMap permissions = new OSDMap | 567 | OSDMap permissions = new OSDMap |
568 | { | 568 | { |
@@ -601,7 +601,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
601 | 601 | ||
602 | if (!success) | 602 | if (!success) |
603 | { | 603 | { |
604 | m_log.Warn("[INVENTORY CONNECTOR]: Error creating item " + item.Name + " for " + item.Owner + ": " + | 604 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error creating item " + item.Name + " for " + item.Owner + ": " + |
605 | response["Message"].AsString()); | 605 | response["Message"].AsString()); |
606 | } | 606 | } |
607 | 607 | ||
@@ -785,7 +785,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
785 | 785 | ||
786 | if (invItem.BasePermissions == 0) | 786 | if (invItem.BasePermissions == 0) |
787 | { | 787 | { |
788 | m_log.InfoFormat("[INVENTORY CONNECTOR]: Forcing item permissions to full for item {0} ({1})", | 788 | m_log.InfoFormat("[SIMIAN INVENTORY CONNECTOR]: Forcing item permissions to full for item {0} ({1})", |
789 | invItem.Name, invItem.ID); | 789 | invItem.Name, invItem.ID); |
790 | invItem.BasePermissions = (uint)PermissionMask.All; | 790 | invItem.BasePermissions = (uint)PermissionMask.All; |
791 | invItem.CurrentPermissions = (uint)PermissionMask.All; | 791 | invItem.CurrentPermissions = (uint)PermissionMask.All; |
@@ -820,7 +820,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
820 | 820 | ||
821 | if (!success) | 821 | if (!success) |
822 | { | 822 | { |
823 | m_log.Warn("[INVENTORY CONNECTOR]: Failed to move " + items.Count + " items to " + | 823 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Failed to move " + items.Count + " items to " + |
824 | destFolderID + ": " + response["Message"].AsString()); | 824 | destFolderID + ": " + response["Message"].AsString()); |
825 | } | 825 | } |
826 | 826 | ||
@@ -863,12 +863,12 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
863 | if (gestures != null && gestures is OSDArray) | 863 | if (gestures != null && gestures is OSDArray) |
864 | return (OSDArray)gestures; | 864 | return (OSDArray)gestures; |
865 | else | 865 | else |
866 | m_log.Error("[INVENTORY CONNECTOR]: Unrecognized active gestures data for " + userID); | 866 | m_log.Error("[SIMIAN INVENTORY CONNECTOR]: Unrecognized active gestures data for " + userID); |
867 | } | 867 | } |
868 | } | 868 | } |
869 | else | 869 | else |
870 | { | 870 | { |
871 | m_log.Warn("[INVENTORY CONNECTOR]: Failed to fetch active gestures for " + userID + ": " + | 871 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Failed to fetch active gestures for " + userID + ": " + |
872 | response["Message"].AsString()); | 872 | response["Message"].AsString()); |
873 | } | 873 | } |
874 | 874 | ||
@@ -887,7 +887,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
887 | OSDMap response = WebUtil.PostToService(m_userServerUrl, requestArgs); | 887 | OSDMap response = WebUtil.PostToService(m_userServerUrl, requestArgs); |
888 | if (!response["Success"].AsBoolean()) | 888 | if (!response["Success"].AsBoolean()) |
889 | { | 889 | { |
890 | m_log.Warn("[INVENTORY CONNECTOR]: Failed to save active gestures for " + userID + ": " + | 890 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Failed to save active gestures for " + userID + ": " + |
891 | response["Message"].AsString()); | 891 | response["Message"].AsString()); |
892 | } | 892 | } |
893 | } | 893 | } |