aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * prevent "create region" console command from being able to create a region wi...Justin Clark-Casey (justincc)2011-08-061-1/+15
| * Temporarily put in a log line which shows which locale the user is running in.Justin Clark-Casey (justincc)2011-07-291-0/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-271-4/+5
|\ \ | |/
| * Add a --noassets option to "save oar".Justin Clark-Casey (justincc)2011-05-261-4/+5
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-121-5/+13
|\ \ | |/
| * create "config show" as a region console command synonym for "config get".Justin Clark-Casey (justincc)2011-04-111-5/+13
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-031-1/+1
|\ \ | |/
| * Comment out some startup logging lines to make up for the one I added earlier...Justin Clark-Casey (justincc)2011-04-021-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-121-2/+3
|\ \ | |/
| * add estate name to show regions console commandJustin Clark-Casey (justincc)2011-02-111-2/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-0/+72
|\ \ | |/
| * New command: show pending-objectsDiva Canto2011-02-061-0/+22
| * Added a couple of console commands to help diagnose issues:Diva Canto2011-02-051-0/+50
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-231-129/+44
|\ \ | |/
| * Update the "config get <section> <key>" command to "config get [<section>] [<...Justin Clark-Casey (justincc)2011-01-211-22/+44
| * Move "show queues" command out of OpenSim.cs and into a separate module.Justin Clark-Casey (justincc)2011-01-201-99/+0
| * remove unimplemented "show assets" commandJustin Clark-Casey (justincc)2011-01-201-8/+0
| * Correct "show queues" to show queued packet numbers for each client instead o...Justin Clark-Casey (justincc)2011-01-191-12/+12
| * Fixes the issue of hung archives. Problem was with SceneObjectSerializer.Diva Canto2011-01-081-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-171-1/+2
|\ \ | |/
| * minor: 'debug packet' console command level <= 50 then don't log ImprovedTers...Justin Clark-Casey (justincc)2010-12-171-1/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-121-3/+4
|\ \ | |/
| * Drop current OAR version back to 0.5 since these are currently now compatible...Justin Clark-Casey (justincc)2010-12-111-3/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-031-3/+3
|\ \ | |/
| * Preservation of creator information now also working in IARs. Cleaned up usag...Diva Canto2010-11-291-3/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-221-1/+2
|\ \ | |/
| * Global creator information working on MySQL DB and on load/save OARs. Creator...Diva Canto2010-11-211-1/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-211-2/+2
|\ \ | |/
| * Bump oar version to 1.0 from 0.5Justin Clark-Casey (justincc)2010-11-201-2/+2