aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ | |/
| * 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
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into bigmergeMelanie2011-11-011-0/+13
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Removed unused show commands from Scene.cs and SceneBase.cs. The show ↵Dan Lake2011-10-311-0/+13
| | | | | | | | modules command in OpenSim.cs now shows both shared modules and region modules.
* | Merge branch 'master' into bigmergeMelanie2011-10-261-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)2011-10-251-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 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 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmergeMelanie2011-10-252-4/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with ↵Justin Clark-Casey (justincc)2011-10-152-4/+1
| | | | | | | | the others
* | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmergeMelanie2011-10-252-2/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * fetch physical_prim switch from [Startup] config from inside scene, as is ↵Justin Clark-Casey (justincc)2011-10-152-2/+1
| | | | | | | | done for most other scene config params
* | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmergeMelanie2011-10-121-3/+3
|\ \ | |/
| * remove the pointless slashes on the end of the (5!) different server stat ↵Justin Clark-Casey (justincc)2011-10-071-3/+3
| | | | | | | | | | | | | | retrieval mechanisms. Original request URLs that end with / will still work, but this will allow one to type /simstatus as well as /simstatus/ Can't do this with webstats yet since it does insane things to the path.
* | Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmergeMelanie2011-10-121-1/+1
|\ \ | |/
| * Add user ID to new estate user prompt, to make it clearer and consistent ↵Justin Clark-Casey (justincc)2011-10-051-1/+1
| | | | | | | | with the main create user prompts
* | Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmergeMelanie2011-10-121-1/+10
|\ \ | |/
| * When creating a new user on the comand line, give the option of allowing a ↵Justin Clark-Casey (justincc)2011-10-041-1/+10
| | | | | | | | | | | | UUID to be specified to override the randomly generated one. This can be useful in some migration cases where recreating user accounts with known IDs will preserve region scene object ownership.
* | Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmergeMelanie2011-10-111-9/+0
|\ \ | |/
| * Remove the unimplented "clear assets" command.Justin Clark-Casey (justincc)2011-09-241-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
* | Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmergeMelanie2011-10-111-1/+2
|\ \ | |/
| * Fix build errors on Windows by adding missing OpenSim.Services.Base referencejustincc2011-09-161-1/+2
| |
* | Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmergeMelanie2011-10-111-2/+11
|\ \ | |/
| * Pass any region scope through to the CreateUser() methodJustin Clark-Casey (justincc)2011-09-161-2/+11
| |
* | Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmergeMelanie2011-10-111-45/+50
|\ \ | |/
| * refactor: move estate owner setup code into separate methodJustin Clark-Casey (justincc)2011-09-161-45/+50
| |
* | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmergeMelanie2011-10-111-0/+50
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
| * Correctly create a freshly created estate owner's default items and avatar ↵Justin Clark-Casey (justincc)2011-09-161-0/+50
| | | | | | | | entries on standalone if applicable.
* | Bring us up to date.Tom2011-09-142-4/+8
|\ \ | |/
| * When creating an OAR, optionally exclude objects according to their permissionsOren Hurvitz2011-09-121-4/+6
| |
| * Delay loading scripts until the scene has finished loadingOren Hurvitz2011-09-091-0/+2
| |
* | Resolve merge commits, stage 1Tom2011-09-042-1/+21
|\ \ | |/
generated by cgit v1.1 at 2024-12-30 07:27:16 +0000