aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-05 19:07:37 +0000
committerMelanie Thielker2017-01-05 19:07:37 +0000
commitb16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch)
tree6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
parentMake it possible to disable the bakes module in the way it is described in co... (diff)
downloadopensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip
opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz
opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2
opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
index bd5841b..dcf25ad 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Services.Connectors
63 /// In this case, -1 is default timeout (100 seconds), not infinite. 63 /// In this case, -1 is default timeout (100 seconds), not infinite.
64 /// </remarks> 64 /// </remarks>
65 private int m_requestTimeoutSecs = -1; 65 private int m_requestTimeoutSecs = -1;
66 private string m_configName = "InventoryService"; 66 private string m_configName = "InventoryService";
67 67
68 private const double CACHE_EXPIRATION_SECONDS = 20.0; 68 private const double CACHE_EXPIRATION_SECONDS = 20.0;
69 private static ExpiringCache<UUID, InventoryItemBase> m_ItemCache = new ExpiringCache<UUID,InventoryItemBase>(); 69 private static ExpiringCache<UUID, InventoryItemBase> m_ItemCache = new ExpiringCache<UUID,InventoryItemBase>();
@@ -80,7 +80,7 @@ namespace OpenSim.Services.Connectors
80 public XInventoryServicesConnector(IConfigSource source, string configName) 80 public XInventoryServicesConnector(IConfigSource source, string configName)
81 : base(source, configName) 81 : base(source, configName)
82 { 82 {
83 m_configName = configName; 83 m_configName = configName;
84 Initialise(source); 84 Initialise(source);
85 } 85 }
86 86
@@ -114,13 +114,13 @@ namespace OpenSim.Services.Connectors
114 114
115 StatsManager.RegisterStat( 115 StatsManager.RegisterStat(
116 new Stat( 116 new Stat(
117 "RequestsMade", 117 "RequestsMade",
118 "Requests made", 118 "Requests made",
119 "Number of requests made to the remove inventory service", 119 "Number of requests made to the remove inventory service",
120 "requests", 120 "requests",
121 "inventory", 121 "inventory",
122 serviceURI, 122 serviceURI,
123 StatType.Pull, 123 StatType.Pull,
124 MeasuresOfInterest.AverageChangeOverTime, 124 MeasuresOfInterest.AverageChangeOverTime,
125 s => s.Value = RequestsMade, 125 s => s.Value = RequestsMade,
126 StatVerbosity.Debug)); 126 StatVerbosity.Debug));
@@ -251,7 +251,7 @@ namespace OpenSim.Services.Connectors
251 251
252 return inventory; 252 return inventory;
253 } 253 }
254 254
255 public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs) 255 public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs)
256 { 256 {
257 InventoryCollection[] inventoryArr = new InventoryCollection[folderIDs.Length]; 257 InventoryCollection[] inventoryArr = new InventoryCollection[folderIDs.Length];
@@ -674,7 +674,7 @@ namespace OpenSim.Services.Connectors
674 { "ASSET", assetID.ToString() } 674 { "ASSET", assetID.ToString() }
675 }); 675 });
676 676
677 // We cannot use CheckReturn() here because valid values for RESULT are "false" (in the case of request failure) or an int 677 // We cannot use CheckReturn() here because valid values for RESULT are "false" (in the case of request failure) or an int
678 if (ret == null) 678 if (ret == null)
679 return 0; 679 return 0;
680 680
@@ -719,7 +719,7 @@ namespace OpenSim.Services.Connectors
719 reply = SynchronousRestFormsRequester.MakeRequest( 719 reply = SynchronousRestFormsRequester.MakeRequest(
720 "POST", m_ServerURI + "/xinventory", 720 "POST", m_ServerURI + "/xinventory",
721 ServerUtils.BuildQueryString(sendData), m_requestTimeoutSecs, m_Auth); 721 ServerUtils.BuildQueryString(sendData), m_requestTimeoutSecs, m_Auth);
722 722
723 if (reply != String.Empty) 723 if (reply != String.Empty)
724 break; 724 break;
725 725