From bf4d701cd5ae74dfc0d52feddee1614b93f5a569 Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Fri, 27 Mar 2009 12:49:27 +0000 Subject: From: Alan Webb Fixed problem with REST services caused by changes to the OpenSim core code base - the comms manager had been 'modularized'. Also added additional debugging to RemoteAdmin interface. --- OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs') diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs index f0a5308..5ff9da3 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs @@ -227,16 +227,13 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory // them easy to reach from anywhere in the assembly. Rest.main = openSim; + if(Rest.main == null) + throw new Exception("OpenSim base pointer is null"); + Rest.Plugin = this; - Rest.Comms = Rest.main.CommunicationsManager; - Rest.UserServices = Rest.Comms.UserService; - Rest.InventoryServices = Rest.Comms.InventoryService; - Rest.AssetServices = Rest.Comms.AssetCache; - Rest.AvatarServices = Rest.Comms.AvatarService; Rest.Config = Config; Rest.Prefix = Prefix; Rest.GodKey = GodKey; - Rest.Authenticate = Rest.Config.GetBoolean("authenticate", Rest.Authenticate); Rest.Scheme = Rest.Config.GetString("auth-scheme", Rest.Scheme); Rest.Secure = Rest.Config.GetBoolean("secured", Rest.Secure); @@ -253,7 +250,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory (Rest.Authenticate ? "" : "not ")); Rest.Log.InfoFormat("{0} Security is {1}enabled", MsgId, - (Rest.Authenticate ? "" : "not ")); + (Rest.Secure ? "" : "not ")); Rest.Log.InfoFormat("{0} Extended URI escape processing is {1}enabled", MsgId, (Rest.ExtendedEscape ? "" : "not ")); -- cgit v1.1