diff options
author | Kevin Houlihan & Michelle Argus | 2011-09-21 22:46:14 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-24 01:59:02 +0100 |
commit | 39d7945efc8daa6e5cd0f4728b499e7a624526cd (patch) | |
tree | efa8a8e1c77aecb540f35209fee39b6c4f778298 /OpenSim/Region/CoreModules/Scripting | |
parent | Don't try and resolve user account for authorization if the agent has come in... (diff) | |
download | opensim-SC_OLD-39d7945efc8daa6e5cd0f4728b499e7a624526cd.zip opensim-SC_OLD-39d7945efc8daa6e5cd0f4728b499e7a624526cd.tar.gz opensim-SC_OLD-39d7945efc8daa6e5cd0f4728b499e7a624526cd.tar.bz2 opensim-SC_OLD-39d7945efc8daa6e5cd0f4728b499e7a624526cd.tar.xz |
Added a setting to [Startup] section of config that will allow the simulator to start up with no regions configured.
I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region.
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs index ed3e516..6f83948 100644 --- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs | |||
@@ -112,10 +112,13 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL | |||
112 | 112 | ||
113 | public void PostInitialise() | 113 | public void PostInitialise() |
114 | { | 114 | { |
115 | m_textureManager = m_scene.RequestModuleInterface<IDynamicTextureManager>(); | 115 | if (m_scene != null) |
116 | if (m_textureManager != null) | ||
117 | { | 116 | { |
118 | m_textureManager.RegisterRender(GetContentType(), this); | 117 | m_textureManager = m_scene.RequestModuleInterface<IDynamicTextureManager>(); |
118 | if (m_textureManager != null) | ||
119 | { | ||
120 | m_textureManager.RegisterRender(GetContentType(), this); | ||
121 | } | ||
119 | } | 122 | } |
120 | } | 123 | } |
121 | 124 | ||