aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-101-2/+3
|\
| * Saving estate state is really slow (relatively) and it getsMic Bowman2012-05-101-2/+3
* | Merge branch 'master' into careminsterMelanie2012-04-291-4/+4
|\ \ | |/
| * Put scene object related console commands into new "Objects" help category ra...Justin Clark-Casey (justincc)2012-04-281-4/+4
* | Merge branch 'master' into careminsterMelanie2012-03-221-26/+8
|\ \ | |/
| * Incorporate scene teleporting debugging into "debug scene teleport true|false...Justin Clark-Casey (justincc)2012-03-211-16/+1
| * Replace "scene debug true false true" console command with "scene debug scrip...Justin Clark-Casey (justincc)2012-03-211-11/+8
* | Merge branch 'master' into careminsterMelanie2012-03-181-1/+5
|\ \ | |/
| * Allow comments to appear in command scripts (e.g. shutdown_commands.txt).Justin Clark-Casey (justincc)2012-03-161-1/+5
* | Merge branch 'master' into careminsterMelanie2012-03-081-50/+37
|\ \ | |/
| * Move "change region" command into general categoryJustin Clark-Casey (justincc)2012-03-081-1/+1
| * Change "help" to display categories/module list then "help <category/module>"...Justin Clark-Casey (justincc)2012-03-081-50/+37
* | Merge branch 'master' into careminsterMelanie2012-01-281-2/+6
|\ \ | |/
| * Add experimental --publish option to "save oar" so that OARs reloaded to the ...Justin Clark-Casey (justincc)2012-01-281-2/+6
* | Merge branch 'master' into careminsterMelanie2012-01-261-2/+2
|\ \ | |/
| * Update save oar and save iar help responses to reflect new -h|--homenebadon2012-01-251-2/+2
* | Merge branch 'master' into careminsterMelanie2012-01-101-1/+1
|\ \ | |/
| * correct very minor typo in "debug scene" helpJustin Clark-Casey (justincc)2012-01-101-1/+1
* | Merge branch 'master' into careminsterMelanie2012-01-101-0/+17
|\ \ | |/
| * Teleport DebuggingBlueWall2012-01-101-0/+17
* | Merge branch 'master' into careminsterMelanie2011-12-181-13/+14
|\ \ | |/
| * Provide user feedback on execution of "backup" region console commandJustin Clark-Casey (justincc)2011-12-171-1/+2
| * If a startup simulator script is present, run it after the normal region sele...Justin Clark-Casey (justincc)2011-12-171-12/+12
* | Merge branch 'master' into bigmergeMelanie2011-12-051-1/+1
|\ \ | |/
| * Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID dictionar...Justin Clark-Casey (justincc)2011-12-031-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-12-011-4/+29
|\ \ | |/
| * Provide more user feedback when "debug http" is setJustin Clark-Casey (justincc)2011-11-291-1/+4
| * Improve some of the debug help messagesJustin Clark-Casey (justincc)2011-11-291-3/+3
| * Add "debug http" command for currently simple extra debug logging of non-even...Justin Clark-Casey (justincc)2011-11-291-2/+24
* | Merge branch 'master' into bigmergeMelanie2011-11-141-18/+0
|\ \ | |/
| * Remove SceneViewer from ScenePresence to reduce quadruple queueing ofDan Lake2011-11-111-18/+0
* | Merge branch 'master' into bigmergeMelanie2011-11-111-1/+1
|\ \ | |/
| * Pick up the intended ConsolePrompt from [Startup] instead of console_prompt.Justin Clark-Casey (justincc)2011-11-111-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-101-3/+28
|\ \ | |/
| * Alter commit 3758306 to allow region name to be substituted within a region c...Justin Clark-Casey (justincc)2011-11-101-3/+28
* | Merge branch 'master' into bigmergeMelanie2011-11-101-3/+6
|\ \ | |/
| * convert tabs from commit 3758306 to spacesJustin Clark-Casey (justincc)2011-11-101-3/+6
* | Merge branch 'master' into bigmergeMelanie2011-11-101-2/+3
|\ \ | |/
| * Allow custom setting for the console promptGuduleLapointe2011-11-101-2/+3
* | Merge branch 'master' into bigmergeMelanie2011-11-011-0/+13
|\ \ | |/
| * Removed unused show commands from Scene.cs and SceneBase.cs. The show modules...Dan Lake2011-10-311-0/+13
* | Merge branch 'master' into bigmergeMelanie2011-10-261-0/+1
|\ \ | |/
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o...Justin Clark-Casey (justincc)2011-10-251-0/+1
* | Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmergeMelanie2011-10-251-4/+8
|\ \ | |/
| * Allow an avatar to be explicitly named to the "debug packet" commandJustin Clark-Casey (justincc)2011-10-171-4/+8
* | Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmergeMelanie2011-10-111-9/+0
|\ \ | |/
| * Remove the unimplented "clear assets" command.Justin Clark-Casey (justincc)2011-09-241-9/+0
* | Bring us up to date.Tom2011-09-141-4/+6
|\ \ | |/
| * When creating an OAR, optionally exclude objects according to their permissionsOren Hurvitz2011-09-121-4/+6
* | Resolve merge commits, stage 1Tom2011-09-041-1/+17
|\ \ | |/