Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-01-10 | 1 | -1/+1 |
|\ | |||||
| * | correct very minor typo in "debug scene" help | Justin Clark-Casey (justincc) | 2012-01-10 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-10 | 1 | -0/+17 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | Teleport Debugging | BlueWall | 2012-01-10 | 1 | -0/+17 |
| | | | | | | | | | | | | Move setting from ini to existing facitilies - thanks justincc toggle with console command: debug teleport | ||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-18 | 1 | -13/+14 |
|\ \ | |/ | |||||
| * | Provide user feedback on execution of "backup" region console command | Justin Clark-Casey (justincc) | 2011-12-17 | 1 | -1/+2 |
| | | |||||
| * | If a startup simulator script is present, run it after the normal region ↵ | Justin Clark-Casey (justincc) | 2011-12-17 | 1 | -12/+12 |
| | | | | | | | | | | | | | | selection code rather than before. This allows the script to change the selected region without having it immediately undone. Thanks to Garmin Kawaguichi for this patch. | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID ↵ | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -1/+1 |
| | | | | | | | | dictionary rather than AgentCircuitManager.AgentCircuits directly in "show circuits" to avoid enumeration exceptions | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-01 | 1 | -4/+29 |
|\ \ | |/ | |||||
| * | Provide more user feedback when "debug http" is set | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -1/+4 |
| | | |||||
| * | Improve some of the debug help messages | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -3/+3 |
| | | |||||
| * | Add "debug http" command for currently simple extra debug logging of ↵ | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -2/+24 |
| | | | | | | | | non-event queue inbound http requests to a simulator | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-14 | 1 | -18/+0 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneViewer.cs | ||||
| * | Remove SceneViewer from ScenePresence to reduce quadruple queueing of | Dan Lake | 2011-11-11 | 1 | -18/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | prim update to only triple queuing. Existing method was: 1. Schedule prim for update, adding to scene update list 2. Update on SOGs during heartbeat queues update onto each SceneViewer 3. Update on SPs during heartbeat queues update onto each IClientAPI 4. ProcessEntityUpdates queues updates into UDP send stack Now the SceneViewer has been eliminated so updates are scheduled at any time and then put onto the IClientAPI priority queues immediately during SceneGraph.UpdateObjectGroups. | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-11 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | ||||
| * | Pick up the intended ConsolePrompt from [Startup] instead of console_prompt. | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -1/+1 |
| | | | | | | | | Addresses http://opensimulator.org/mantis/view.php?id=5786 | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -3/+28 |
|\ \ | |/ | |||||
| * | Alter commit 3758306 to allow region name to be substituted within a region ↵ | Justin Clark-Casey (justincc) | 2011-11-10 | 1 | -3/+28 |
| | | | | | | | | | | | | | | | | console prompt This is to allow broader subsitution in the future. Currently, the only substitions are \R (for region name) and \\ (for a single backslash) e.g. "Region (\R) " is the current and continuing default prompt This renames custom_prompt in [Startup] to ConsolePrompt | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -3/+6 |
|\ \ | |/ | |||||
| * | convert tabs from commit 3758306 to spaces | Justin Clark-Casey (justincc) | 2011-11-10 | 1 | -3/+6 |
| | | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -2/+3 |
|\ \ | |/ | |||||
| * | Allow custom setting for the console prompt | GuduleLapointe | 2011-11-10 | 1 | -2/+3 |
| | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-01 | 1 | -0/+13 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | ||||
| * | Removed unused show commands from Scene.cs and SceneBase.cs. The show ↵ | Dan Lake | 2011-10-31 | 1 | -0/+13 |
| | | | | | | | | modules command in OpenSim.cs now shows both shared modules and region modules. | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -0/+1 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs | ||||
| * | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo) | ||||
* | | Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+8 |
|\ \ | |/ | |||||
| * | Allow an avatar to be explicitly named to the "debug packet" command | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -4/+8 |
| | | |||||
* | | Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmerge | Melanie | 2011-10-11 | 1 | -9/+0 |
|\ \ | |/ | |||||
| * | Remove the unimplented "clear assets" command. | Justin Clark-Casey (justincc) | 2011-09-24 | 1 | -9/+0 |
| | | | | | | | | | | This was a bizarre relic of a bygone age that had no implementations. If you're using and want to clear the flotsam asset cache then please use the existing "fcache clear" command | ||||
* | | Bring us up to date. | Tom | 2011-09-14 | 1 | -4/+6 |
|\ \ | |/ | |||||
| * | When creating an OAR, optionally exclude objects according to their permissions | Oren Hurvitz | 2011-09-12 | 1 | -4/+6 |
| | | |||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -1/+17 |
|\ \ | |/ | |||||
| * | prevent "create region" console command from being able to create a region ↵ | Justin Clark-Casey (justincc) | 2011-08-06 | 1 | -1/+15 |
| | | | | | | | | | | | | with the same id as one that already exists. Addresses http://opensimulator.org/mantis/view.php?id=5617 | ||||
| * | Temporarily put in a log line which shows which locale the user is running in. | Justin Clark-Casey (justincc) | 2011-07-29 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-27 | 1 | -4/+5 |
|\ \ | |/ | |||||
| * | Add a --noassets option to "save oar". | Justin Clark-Casey (justincc) | 2011-05-26 | 1 | -4/+5 |
| | | | | | | | | | | This switch stops any assets being saved in the oar. This can be useful if you're using OAR to backup regions and you know you'll always have the original asset database available. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-12 | 1 | -5/+13 |
|\ \ | |/ | |||||
| * | create "config show" as a region console command synonym for "config get". | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -5/+13 |
| | | | | | | | | This is to create greater consistency with all the other show commands. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-03 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Comment out some startup logging lines to make up for the one I added ↵ | Justin Clark-Casey (justincc) | 2011-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | | earlier on. Most of these are where the region modules are telling us they are disabled. Convention is only to log when enabled (even that is really noisy) | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-12 | 1 | -2/+3 |
|\ \ | |/ | |||||
| * | add estate name to show regions console command | Justin Clark-Casey (justincc) | 2011-02-11 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 1 | -0/+72 |
|\ \ | |/ | |||||
| * | New command: show pending-objects | Diva Canto | 2011-02-06 | 1 | -0/+22 |
| | | |||||
| * | Added a couple of console commands to help diagnose issues: | Diva Canto | 2011-02-05 | 1 | -0/+50 |
| | | | | | | | | | | show circuits: shows the lists of agent circuit data show http-handlers: shows the currently registered http handlers | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-23 | 1 | -129/+44 |
|\ \ | |/ | |||||
| * | Update the "config get <section> <key>" command to "config get [<section>] ↵ | Justin Clark-Casey (justincc) | 2011-01-21 | 1 | -22/+44 |
| | | | | | | | | | | | | | | | | | | [<key>]" The config get command shows a current config value on the console. Now, if <key> is omitted then all the values for the given section are printed. If <section> is ommitted then all sections and all keys are printed. Current config can also be dumped to a file using "config save <path>". This can be handy for resolving or eliminating config issues | ||||
| * | Move "show queues" command out of OpenSim.cs and into a separate module. | Justin Clark-Casey (justincc) | 2011-01-20 | 1 | -99/+0 |
| | |