aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-07-22 16:21:16 +0000
committerJustin Clarke Casey2008-07-22 16:21:16 +0000
commita1d481d0f6dd4334356874359ea6859e109b1578 (patch)
tree5d8da8a3fb19c14d0528bbe40b4ec4ce0e72ea20 /OpenSim
parentUpdate svn properties. Squash a couple of warnings. (diff)
downloadopensim-SC_OLD-a1d481d0f6dd4334356874359ea6859e109b1578.zip
opensim-SC_OLD-a1d481d0f6dd4334356874359ea6859e109b1578.tar.gz
opensim-SC_OLD-a1d481d0f6dd4334356874359ea6859e109b1578.tar.bz2
opensim-SC_OLD-a1d481d0f6dd4334356874359ea6859e109b1578.tar.xz
* minor: Make create user command appear on the region console only if the region is running standalone
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs1
-rw-r--r--OpenSim/Region/Application/OpenSim.cs18
2 files changed, 15 insertions, 4 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index c61db33..7a8da52 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -149,6 +149,7 @@ namespace OpenSim.Framework.Servers
149 switch (command) 149 switch (command)
150 { 150 {
151 case "help": 151 case "help":
152 Notice("");
152 Notice("quit - equivalent to shutdown."); 153 Notice("quit - equivalent to shutdown.");
153 154
154 Notice("show info - show server information (e.g. startup path)."); 155 Notice("show info - show server information (e.g. startup path).");
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 497a25b..27b6694 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -248,10 +248,9 @@ namespace OpenSim
248 m_console.Notice("alert - send alert to a designated user or all users."); 248 m_console.Notice("alert - send alert to a designated user or all users.");
249 m_console.Notice(" alert [First] [Last] [Message] - send an alert to a user. Case sensitive."); 249 m_console.Notice(" alert [First] [Last] [Message] - send an alert to a user. Case sensitive.");
250 m_console.Notice(" alert general [Message] - send an alert to all users."); 250 m_console.Notice(" alert general [Message] - send an alert to all users.");
251 m_console.Notice("backup - trigger a simulator backup"); 251 m_console.Notice("backup - persist simulator objects to the database ahead of the normal schedule.");
252 m_console.Notice("clear-assets - clear asset cache"); 252 m_console.Notice("clear-assets - clear asset cache");
253 m_console.Notice("create-region <name> <regionfile.xml> - creates a new region"); 253 m_console.Notice("create-region <name> <regionfile.xml> - creates a new region");
254 m_console.Notice("create user - adds a new user.");
255 m_console.Notice("change-region [name] - sets the region that many of these commands affect."); 254 m_console.Notice("change-region [name] - sets the region that many of these commands affect.");
256 m_console.Notice("command-script [filename] - Execute command in a file."); 255 m_console.Notice("command-script [filename] - Execute command in a file.");
257 m_console.Notice("debug - debugging commands"); 256 m_console.Notice("debug - debugging commands");
@@ -277,8 +276,17 @@ namespace OpenSim
277 m_console.Notice("config set section field value - set a config value"); 276 m_console.Notice("config set section field value - set a config value");
278 m_console.Notice("config get section field - get a config value"); 277 m_console.Notice("config get section field - get a config value");
279 m_console.Notice("config save - save OpenSim.ini"); 278 m_console.Notice("config save - save OpenSim.ini");
280 m_console.Notice("terrain help - show help for terrain commands."); 279 m_console.Notice("terrain help - show help for terrain commands.");
281 ShowPluginCommandsHelp(CombineParams(cmdparams, 0), m_console); 280 ShowPluginCommandsHelp(CombineParams(cmdparams, 0), m_console);
281
282 if (m_sandbox)
283 {
284 m_console.Notice("");
285 m_console.Notice("create user - adds a new user.");
286 }
287
288 m_console.Notice("");
289
282 break; 290 break;
283 291
284 case "save-xml": 292 case "save-xml":
@@ -336,7 +344,9 @@ namespace OpenSim
336 break; 344 break;
337 345
338 case "create": 346 case "create":
339 CreateAccount(cmdparams); 347 if (m_sandbox)
348 CreateAccount(cmdparams);
349
340 break; 350 break;
341 351
342 case "create-region": 352 case "create-region":