| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-11-22 | 11 | -54/+54 |
| |\ | |||||
| | * | Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because it | Melanie | 2012-11-22 | 11 | -54/+54 |
| | | | | | | | | | conflicts with PhysicsShape type defined in later libOMV | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-22 | 13 | -706/+605 |
| |\ \ | |/ | |||||
| | * | Factor out command script code. | Justin Clark-Casey (justincc) | 2012-11-22 | 3 | -77/+50 |
| | | | | | | | | | This also allows comments in command scripts (lines starting with ;, # or //) to be used across all servers | ||||
| | * | Make "config show/set/get/save" console commands available on all servers | Justin Clark-Casey (justincc) | 2012-11-22 | 6 | -189/+172 |
| | | | |||||
| | * | Factor out common pid file creation and removal code. | Justin Clark-Casey (justincc) | 2012-11-22 | 3 | -62/+50 |
| | | | | | | | | | Log path at which pid file is created or reason for failure to create. | ||||
| | * | Add "get log level" command - this returns the current server session ↵ | Justin Clark-Casey (justincc) | 2012-11-22 | 1 | -19/+31 |
| | | | | | | | | | | | | | console logging level. This supersedes getting information by calling "set log level" without a 4th argument, which is confusing. | ||||
| | * | Remove unused BaseOpenSimServer.ShowHelp() | Justin Clark-Casey (justincc) | 2012-11-22 | 1 | -21/+0 |
| | | | |||||
| | * | Make "set log level" command available across all servers | Justin Clark-Casey (justincc) | 2012-11-22 | 3 | -32/+31 |
| | | | |||||
| | * | Make "show info" command available across all servers | Justin Clark-Casey (justincc) | 2012-11-22 | 5 | -237/+186 |
| | | | | | | | | | This helpfully lists version information, startup location and console log level | ||||
| | * | Factor out common registration of "show uptime" command | Justin Clark-Casey (justincc) | 2012-11-22 | 3 | -71/+78 |
| | | | |||||
| | * | factor out common HandleShow code for "show uptime" | Justin Clark-Casey (justincc) | 2012-11-22 | 9 | -63/+72 |
| | | | |||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-11-22 | 1 | -7/+35 |
| |\ \ | |||||
| | * | | * While this is not producing any problems.. and does help in low bandwidth ↵ | teravus | 2012-11-22 | 1 | -7/+35 |
| | | | | | | | | | | | | | situations I can't demonstrate that it's better then just letting the client request what it needs in terms of responsiveness of the mesh in the scene yet. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-11-22 | 3 | -48/+66 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | refactor: Factor out copy/pasted server uptime report code | Justin Clark-Casey (justincc) | 2012-11-22 | 3 | -48/+66 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-11-22 | 21 | -325/+893 |
| |\ \ \ | |/ / | |||||
| | * | | If an asset POST does not contain well-formed XML, return a 400 (Bad ↵ | Justin Clark-Casey (justincc) | 2012-11-22 | 2 | -3/+38 |
| | | | | | | | | | | | | | Request) HTTP status rather than simply dropping the request. | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-11-22 | 17 | -322/+715 |
| | |\ \ | |||||
| | | * | | BulletSim: update DLLs and SOs. No functional changes. Only the parameter ↵ | Robert Adams | 2012-11-21 | 4 | -0/+0 |
| | | | | | | | | | | | | | | | | | block format changed. | ||||
| | | * | | BulletSim: Make avatar capsule so it is not circular. | Robert Adams | 2012-11-21 | 7 | -22/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple attempt to make avatars better shaped. Replace parameter 'avatarCapsuleRadius' with 'avatarCapsuleWidth' and 'avatarCapsuleDepth'. More tweeking to avatar height calculation. A little better but short avatar's feet are above the terrain and tall avatar's feet are a little below the ground. | ||||
| | | * | | BulletSim: Properly position mesh terrain on creation (fixes terrain not ↵ | Robert Adams | 2012-11-21 | 2 | -76/+44 |
| | | | | | | | | | | | | | | | | | appearing to be working). Centralize terrain shape creation logic. Remove very chatty detail log messages. | ||||
| | | * | | BulletSim: add terrainImplementation parameter with default to Mesh. | Robert Adams | 2012-11-21 | 3 | -5/+46 |
| | | | | | |||||
| | | * | | BulletSim: fix line endings to be all Linux style (windows style keeps ↵ | Robert Adams | 2012-11-21 | 2 | -454/+454 |
| | | | | | | | | | | | | | | | | | creeping in) | ||||
| | | * | | BulletSim: enablement and debugging of mesh terrain. | Robert Adams | 2012-11-21 | 4 | -36/+253 |
| | | | | | |||||
| | | * | | BulletSim: pull heightmap implementation out of the terrain manager so a ↵ | Robert Adams | 2012-11-21 | 4 | -181/+327 |
| | | | | | | | | | | | | | | | | | mesh terrain can be implemented. | ||||
| | | * | | BulletSim: rename SHAPE_AVATAR to SHAPE_CAPSULE with the eye to eventually ↵ | Robert Adams | 2012-11-21 | 4 | -8/+8 |
| | | | | | | | | | | | | | | | | | having mesh avatars. | ||||
| | | * | | BulletSim: uplevel FixedShapeKey out of ShapeData structure (since it is ↵ | Robert Adams | 2012-11-21 | 3 | -20/+22 |
| | | | | | | | | | | | | | | | | | getting simplified out of existance someday) and update all the references to same. | ||||
| | | * | | BulletSim: uplevel PhysicsShapeType out of ShapeData structure (since it is ↵ | Robert Adams | 2012-11-21 | 9 | -66/+67 |
| | | | | | | | | | | | | | | | | | getting simplified out of existance someday) and update all the references to that enum. | ||||
| | | * | | BulletSim: change PositionSanityCheck to apply a force to correct position ↵ | Robert Adams | 2012-11-21 | 2 | -33/+30 |
| | | | | | | | | | | | | | | | | | corrections (below ground and floating). | ||||
| | | * | | BulletSim: tweek avatar capsule parameters so avatar feet don't go below ↵ | Robert Adams | 2012-11-21 | 2 | -8/+10 |
| | | | | | | | | | | | | | | | | | ground. This solves the bouncing, short avatar problem (Mantis 6403). | ||||
| | * | | | Add regression test for a good request made to the asset service post handler. | Justin Clark-Casey (justincc) | 2012-11-21 | 3 | -0/+140 |
| | |/ / | | | | | | | | | | Adds new OpenSim.Server.Handlers.Tests.dll to test suite | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-11-20 | 9 | -213/+197 |
| |\ \ \ | |/ / | |||||
| | * | | If GetAgents() is called with an empty userIDs array then don't bother with ↵ | Justin Clark-Casey (justincc) | 2012-11-20 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | a useless potentially network call on the scene presence service connector. This also eliminates the "[PRESENCE HANDLER]: GetAgents called without required uuids argument" which has started to pop up in the logs when a call is made with an empty uuid array as occasionally happens. | ||||
| | * | | refactor: Move common presence connector code into BasePresenceServiceConnector | Justin Clark-Casey (justincc) | 2012-11-20 | 4 | -193/+145 |
| | | | | |||||
| | * | | Add Iain Oliver to CONTRIBUTORS.txt | Justin Clark-Casey (justincc) | 2012-11-20 | 1 | -0/+1 |
| | | | | |||||
| | * | | Minor formatting for 0962a35d and a few one-line comments as to why that ↵ | Justin Clark-Casey (justincc) | 2012-11-20 | 1 | -8/+7 |
| | | | | | | | | | | | | | code is there | ||||
| | * | | Fix movetotarget on mega regions. | Iain Oliver | 2012-11-20 | 1 | -3/+21 |
| | | | | |||||
| | * | | minor: If logging full incoming HTTP data, don't deceptively print ... at ↵ | Justin Clark-Casey (justincc) | 2012-11-20 | 1 | -2/+5 |
| | | | | | | | | | | | | | the end of the body. | ||||
| | * | | Expose configuration options for the XmlRpcGridRouter | BlueWall | 2012-11-19 | 2 | -15/+22 |
| | | | | | | | | | | | | | Expose configuration options for the XmlRpcGridRouter to allow simulators to register llRemoteData channels with an external routing service | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-11-20 | 8 | -19/+127 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge branch 'teravuswork' into avination | Melanie | 2012-11-20 | 11 | -82/+668 |
| | |\ \ | |||||
| | | * | | * Plumbing and basic setting of the GetMesh Cap Throttler. | teravus | 2012-11-17 | 8 | -19/+127 |
| | | | | | | | | | | | | | | | | | * Last step is to flip the throttle distribution. | ||||
| * | | | | Merge commit 'e9153e1d1aae50024d8cd05fe14a9bce34343a0e' into careminster | Melanie | 2012-11-20 | 0 | -0/+0 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Revert "Merge master into teravuswork", it should have been avination, not ↵ | teravus | 2012-11-15 | 337 | -30953/+13136 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64. | ||||
| | * | | | Merge master into teravuswork | teravus | 2012-11-15 | 336 | -13123/+30950 |
| | |\ \ \ | |||||
| * | \ \ \ | Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster | Melanie | 2012-11-20 | 4 | -78/+546 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | ||||
| | * | | | | * Fixes mesh loading issues in last commit. | teravus | 2012-11-15 | 1 | -0/+9 |
| | | | | | | |||||
| | * | | | | * Prep work switching the GetMeshModule over to a poll service. | teravus | 2012-11-09 | 4 | -79/+538 |
| | | | | | | | | | | | | | | | | | | | | | * This still has the image throttler in it.. as is... so it's not suitable for live yet.... The throttler keeps track of the task throttle but doesn't balance the UDP throttle yet. | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-19 | 10 | -352/+220 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |