aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
diff options
context:
space:
mode:
authorDr Scofield2008-10-20 18:07:06 +0000
committerDr Scofield2008-10-20 18:07:06 +0000
commit12042cdc2b53e581ace6a017d9b17bd763a544b2 (patch)
tree0d99aa0e5dc5349d420c820c2c78c59f3228957f /OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
parentactually enabling SaveOAR XmlRpc ;-) (diff)
downloadopensim-SC_OLD-12042cdc2b53e581ace6a017d9b17bd763a544b2.zip
opensim-SC_OLD-12042cdc2b53e581ace6a017d9b17bd763a544b2.tar.gz
opensim-SC_OLD-12042cdc2b53e581ace6a017d9b17bd763a544b2.tar.bz2
opensim-SC_OLD-12042cdc2b53e581ace6a017d9b17bd763a544b2.tar.xz
From: Alan Webb <alan_webb@us.ibm.com>
cleanups and assorted fixes to REST inventory, asset, and appearance services.
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs9
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
index 9af5cd0..f9abc49 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
@@ -52,6 +52,12 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
52 Rest.Log.InfoFormat("{0} Asset services initializing", MsgId); 52 Rest.Log.InfoFormat("{0} Asset services initializing", MsgId);
53 Rest.Log.InfoFormat("{0} Using REST Implementation Version {1}", MsgId, Rest.Version); 53 Rest.Log.InfoFormat("{0} Using REST Implementation Version {1}", MsgId, Rest.Version);
54 54
55 // This is better than a null reference.
56
57 if (Rest.AssetServices == null)
58 throw new Exception(String.Format("{0} OpenSim asset services are not available",
59 MsgId));
60
55 // If the handler specifies a relative path for its domain 61 // If the handler specifies a relative path for its domain
56 // then we must add the standard absolute prefix, e.g. /admin 62 // then we must add the standard absolute prefix, e.g. /admin
57 63
@@ -130,9 +136,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
130 136
131 try 137 try
132 { 138 {
133 // digest scheme seems borked: disable it for the time
134 // being
135 rdata.scheme = Rest.AS_BASIC;
136 if (!rdata.IsAuthenticated) 139 if (!rdata.IsAuthenticated)
137 { 140 {
138 rdata.Fail(Rest.HttpStatusCodeNotAuthorized, String.Format("user \"{0}\" could not be authenticated")); 141 rdata.Fail(Rest.HttpStatusCodeNotAuthorized, String.Format("user \"{0}\" could not be authenticated"));