diff options
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs | 11 |
1 files changed, 4 insertions, 7 deletions
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 | |||
227 | // them easy to reach from anywhere in the assembly. | 227 | // them easy to reach from anywhere in the assembly. |
228 | 228 | ||
229 | Rest.main = openSim; | 229 | Rest.main = openSim; |
230 | if(Rest.main == null) | ||
231 | throw new Exception("OpenSim base pointer is null"); | ||
232 | |||
230 | Rest.Plugin = this; | 233 | Rest.Plugin = this; |
231 | Rest.Comms = Rest.main.CommunicationsManager; | ||
232 | Rest.UserServices = Rest.Comms.UserService; | ||
233 | Rest.InventoryServices = Rest.Comms.InventoryService; | ||
234 | Rest.AssetServices = Rest.Comms.AssetCache; | ||
235 | Rest.AvatarServices = Rest.Comms.AvatarService; | ||
236 | Rest.Config = Config; | 234 | Rest.Config = Config; |
237 | Rest.Prefix = Prefix; | 235 | Rest.Prefix = Prefix; |
238 | Rest.GodKey = GodKey; | 236 | Rest.GodKey = GodKey; |
239 | |||
240 | Rest.Authenticate = Rest.Config.GetBoolean("authenticate", Rest.Authenticate); | 237 | Rest.Authenticate = Rest.Config.GetBoolean("authenticate", Rest.Authenticate); |
241 | Rest.Scheme = Rest.Config.GetString("auth-scheme", Rest.Scheme); | 238 | Rest.Scheme = Rest.Config.GetString("auth-scheme", Rest.Scheme); |
242 | Rest.Secure = Rest.Config.GetBoolean("secured", Rest.Secure); | 239 | Rest.Secure = Rest.Config.GetBoolean("secured", Rest.Secure); |
@@ -253,7 +250,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
253 | (Rest.Authenticate ? "" : "not ")); | 250 | (Rest.Authenticate ? "" : "not ")); |
254 | 251 | ||
255 | Rest.Log.InfoFormat("{0} Security is {1}enabled", MsgId, | 252 | Rest.Log.InfoFormat("{0} Security is {1}enabled", MsgId, |
256 | (Rest.Authenticate ? "" : "not ")); | 253 | (Rest.Secure ? "" : "not ")); |
257 | 254 | ||
258 | Rest.Log.InfoFormat("{0} Extended URI escape processing is {1}enabled", MsgId, | 255 | Rest.Log.InfoFormat("{0} Extended URI escape processing is {1}enabled", MsgId, |
259 | (Rest.ExtendedEscape ? "" : "not ")); | 256 | (Rest.ExtendedEscape ? "" : "not ")); |