aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-231-2/+1
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Rename Scene.StartTimer() to Start() - this method no longer uses a timer. ↵Justin Clark-Casey (justincc)2012-03-231-1/+1
| | | | | | | | Comment out more effectively unused old heartbeat code.
* | Merge branch 'master' into careminsterMelanie2012-03-221-26/+8
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Incorporate scene teleporting debugging into "debug scene teleport ↵Justin Clark-Casey (justincc)2012-03-211-16/+1
| | | | | | | | true|false" command
| * Replace "scene debug true false true" console command with "scene debug ↵Justin Clark-Casey (justincc)2012-03-211-11/+8
| | | | | | | | | | | | scripting true" or other parameters as appropriate. This is to allow individual switching of scene debug settings and to provide flexibiltiy for additional settings.
* | Merge branch 'master' into careminsterMelanie2012-03-181-1/+5
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Allow comments to appear in command scripts (e.g. shutdown_commands.txt).Justin Clark-Casey (justincc)2012-03-161-1/+5
| | | | | | | | These can start with ; # or //
* | Merge branch 'master' into careminsterMelanie2012-03-111-67/+152
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| * Add ability to specify a default estate to be used when creating regions.Justin Clark-Casey (justincc)2012-03-101-64/+152
| | | | | | | | | | | | | | | | This is configured in the new [Estates] section of OpenSim.ini. If a default estate is configured then all new regions are automatically joined to it instead of asking the user. If the default estate does not already exist then it is created. Current default behaviour remains the same - the user is asked for estate details when necessary. Thanks to Frenando Oliveira for the patch which I adapated further.
* | Merge branch 'master' into careminsterMelanie2012-03-082-59/+48
|\ \ | |/
| * Move "change region" command into general categoryJustin Clark-Casey (justincc)2012-03-081-1/+1
| |
| * Display help commander topics in capitalized form - the commands themselves ↵Justin Clark-Casey (justincc)2012-03-081-4/+6
| | | | | | | | | | | | are still lowercase. Also convert the estate commands to simply AddCommand() calls so that commands from two different modules can be placed in the same category
| * Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-082-56/+43
| | | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* | Merge branch 'master' into careminsterMelanie2012-01-311-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| * Make parcel sale overlays work. No auction support.Melanie2012-01-311-3/+3
| |
* | Make parcel sale overlays work. No auction support.Melanie2012-01-311-3/+3
| |
* | Merge branch 'master' into careminsterMelanie2012-01-281-2/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Add experimental --publish option to "save oar" so that OARs reloaded to the ↵Justin Clark-Casey (justincc)2012-01-281-2/+6
| | | | | | | | same grid don't have the publisher as owner.
* | Merge branch 'master' into careminsterMelanie2012-01-261-2/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Update save oar and save iar help responses to reflect new -h|--homenebadon2012-01-251-2/+2
| | | | | | | | | | switches which replace -p|--profile ie: "save oar --home=http://hg.osgrid.org:80 region.oar"
* | Merge branch 'master' into careminsterMelanie2012-01-252-16/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * Make errors reported by OpenSim when it halts because it can't find certain ↵Justin Clark-Casey (justincc)2012-01-242-16/+9
| | | | | | | | config sections or files a bit more user friendly.
* | 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
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Teleport DebuggingBlueWall2012-01-101-0/+17
| | | | | | | | | | | | Move setting from ini to existing facitilies - thanks justincc toggle with console command: debug teleport
* | Merge branch 'master' into careminsterMelanie2011-12-221-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Remove unused SetAcceleration and add set on Acceleration parameterDan Lake2011-12-201-1/+1
| |
* | 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 ↵Justin Clark-Casey (justincc)2011-12-171-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 commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-081-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Trigger a Jenkins buildBlueWall2011-12-071-0/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-051-3/+3
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-051-3/+3
| | | | | | | | | | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
* | Merge branch 'master' into bigmergeMelanie2011-12-051-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-031-1/+1
| | | | | | | | dictionary rather than AgentCircuitManager.AgentCircuits directly in "show circuits" to avoid enumeration exceptions
* | 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 ↵Justin Clark-Casey (justincc)2011-11-291-2/+24
| | | | | | | | non-event queue inbound http requests to a simulator
* | Merge branch 'master' into bigmergeMelanie2011-11-242-2/+27
|\ \ | |/
| * Shell Environment Variables in configBlueWall2011-11-232-2/+27
| | | | | | | | | | | | Adding updated Nini and support to use shell environment variables in OpenSimulator configuration. Nini @ https://github.com/BlueWall/Nini-Dev
* | Merge branch 'master' into bigmergeMelanie2011-11-141-18/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneViewer.cs
| * Remove SceneViewer from ScenePresence to reduce quadruple queueing ofDan Lake2011-11-111-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 bigmergeMelanie2011-11-111-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-111-1/+1
| | | | | | | | Addresses http://opensimulator.org/mantis/view.php?id=5786
* | Merge branch 'master' into bigmergeMelanie2011-11-101-3/+28
|\ \ | |/
| * Alter commit 3758306 to allow region name to be substituted within a region ↵Justin Clark-Casey (justincc)2011-11-101-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 bigmergeMelanie2011-11-101-3/+6
|\ \ | |/
generated by cgit v1.1 at 2024-12-25 15:01:26 +0000