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
             Rest.Log.InfoFormat("{0} Asset services initializing", MsgId);
             Rest.Log.InfoFormat("{0} Using REST Implementation Version {1}", MsgId, Rest.Version);
 
+            // This is better than a null reference.
+
+            if (Rest.AssetServices == null)
+                throw new Exception(String.Format("{0} OpenSim asset services are not available",
+                                                MsgId));
+
             // If the handler specifies a relative path for its domain
             // then we must add the standard absolute prefix, e.g. /admin
 
@@ -130,9 +136,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
             try
             {
-                // digest scheme seems borked: disable it for the time
-                // being
-                rdata.scheme = Rest.AS_BASIC;
                 if (!rdata.IsAuthenticated)
                 {
                     rdata.Fail(Rest.HttpStatusCodeNotAuthorized, String.Format("user \"{0}\" could not be authenticated"));