aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 327a3c2..2e37029 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -71,11 +71,13 @@ namespace OpenSim
71 71
72 private bool m_silent; 72 private bool m_silent;
73 private string m_logFilename = ("region-console.log"); 73 private string m_logFilename = ("region-console.log");
74 private bool m_permissions = false;
74 75
75 private bool standaloneAuthenticate = false; 76 private bool standaloneAuthenticate = false;
76 private string standaloneWelcomeMessage = null; 77 private string standaloneWelcomeMessage = null;
77 private string standaloneInventoryPlugin = ""; 78 private string standaloneInventoryPlugin = "";
78 private string standaloneUserPlugin = ""; 79 private string standaloneUserPlugin = "";
80
79 81
80 public ConsoleCommand CreateAccount = null; 82 public ConsoleCommand CreateAccount = null;
81 83
@@ -106,6 +108,7 @@ namespace OpenSim
106 m_sandbox = !configSource.Configs["Startup"].GetBoolean("gridmode", false); 108 m_sandbox = !configSource.Configs["Startup"].GetBoolean("gridmode", false);
107 m_physicsEngine = configSource.Configs["Startup"].GetString("physics", "basicphysics"); 109 m_physicsEngine = configSource.Configs["Startup"].GetString("physics", "basicphysics");
108 m_silent = configSource.Configs["Startup"].GetBoolean("noverbose", false); 110 m_silent = configSource.Configs["Startup"].GetBoolean("noverbose", false);
111 m_permissions = configSource.Configs["Startup"].GetBoolean("serverside_object_permissions", false);
109 112
110 m_storageDLL = configSource.Configs["Startup"].GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll"); 113 m_storageDLL = configSource.Configs["Startup"].GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll");
111 114
@@ -182,7 +185,12 @@ namespace OpenSim
182 scene.AddScriptEngine(ScriptEngine, m_log); 185 scene.AddScriptEngine(ScriptEngine, m_log);
183 // TODO: TEMP load default script 186 // TODO: TEMP load default script
184 ScriptEngine.StartScript(Path.Combine("ScriptEngines", "Default.lsl"), new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost()); 187 ScriptEngine.StartScript(Path.Combine("ScriptEngines", "Default.lsl"), new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost());
185 188
189 //Server side object editing permissions checking
190 if (m_permissions)
191 scene.PermissionsMngr.EnablePermissions();
192 else
193 scene.PermissionsMngr.DisablePermissions();
186 194
187 m_localScenes.Add(scene); 195 m_localScenes.Add(scene);
188 196