| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-03 | 311 | -10116/+20710 |
| |\ | |||||
| | * | Merge branch 'avination' into ubitwork | Melanie | 2012-12-03 | 6 | -107/+383 |
| | |\ | |||||
| | | * | *TEST* diferent avatar collider | UbitUmarov | 2012-12-03 | 3 | -103/+350 |
| | | | | |||||
| | | * | fix vertex rounding direction | UbitUmarov | 2012-12-03 | 1 | -1/+8 |
| | | | | |||||
| | | * | *TEST* reduce all mesh vertices resolution to 1e-5. This reduces number | UbitUmarov | 2012-12-03 | 1 | -0/+16 |
| | | | | | | | | | | | | | of unique vertices only originated by math errors in PrimMesher | ||||
| | | * | adjust avatar standing Z position | UbitUmarov | 2012-12-03 | 1 | -5/+11 |
| | | | | |||||
| | | * | Add a transaction ID to the money module path for llTransferLindenDollars | Melanie | 2012-12-03 | 2 | -3/+3 |
| | | | | |||||
| | * | | don't zero constant force and torque in selection | UbitUmarov | 2012-11-24 | 1 | -6/+6 |
| | | | | |||||
| | * | | avoid potencial NullReferenceException | UbitUmarov | 2012-11-24 | 1 | -2/+5 |
| | |/ | |||||
| | * | Remove a superfluous newline from help | Melanie | 2012-11-23 | 1 | -2/+2 |
| | | | |||||
| | * | Merge branch 'careminster' into avination | Melanie | 2012-11-23 | 7 | -33/+129 |
| | |\ | |||||
| | | * | Merge branch 'master' into careminster | Melanie | 2012-11-23 | 7 | -33/+129 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/SceneManager.cs | ||||
| | | | * | Remove the redundant BypassPermissions() checks in EstateManagmentModule. | Justin Clark-Casey (justincc) | 2012-11-23 | 1 | -8/+13 |
| | | | | | | | | | | | | | | | | | This is repeated in the PermissionsModule and checking it earlier does not allow a force override of the bypass value | ||||
| | | | * | minor: Add some console feedback on region restart and log who requested a ↵ | Justin Clark-Casey (justincc) | 2012-11-23 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | | region restart if done from the viewer. | ||||
| | | | * | Fix problem where restarting the currently selected region would stop ↵ | Justin Clark-Casey (justincc) | 2012-11-23 | 4 | -36/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | various console commands (e.g. "show users") from working. This was because the "currently selected" scene reference was being left as the dead scene instead of the restarted Scene object. | ||||
| | | | * | Add regression test for checking scene close when SceneManager is asked to close | Justin Clark-Casey (justincc) | 2012-11-23 | 1 | -0/+58 |
| | | | | | |||||
| | * | | | Remove duplicate registration of the help topics for the module commander | Melanie | 2012-11-23 | 1 | -5/+5 |
| | |/ / | |||||
| | * | | Fix a build break introduced by us having a more efficient DoubleDictionary | Melanie | 2012-11-23 | 1 | -4/+8 |
| | | | | | | | | | | | | | where core has a simple list | ||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-11-23 | 1 | -0/+7 |
| | |\ \ | | |/ | |||||
| | | * | Fix regression where we stopped closing scenes on simulator exit. | Justin Clark-Casey (justincc) | 2012-11-23 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | If we don't do this, then these scenes don't get deregistered from the grid, amongst other things. Regression was introduced in commit 8c130bc (Mon Nov 12 22:50:28 2012 +0000) | ||||
| | * | | 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 | 3 | -223/+30 |
| | |\ \ | | |/ | |||||
| | | * | Factor out command script code. | Justin Clark-Casey (justincc) | 2012-11-22 | 1 | -36/+0 |
| | | | | | | | | | | | | | 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 | 3 | -171/+29 |
| | | | | |||||
| | | * | Make "show info" command available across all servers | Justin Clark-Casey (justincc) | 2012-11-22 | 1 | -16/+1 |
| | | | | | | | | | | | | | This helpfully lists version information, startup location and console log level | ||||
| | | * | factor out common HandleShow code for "show uptime" | Justin Clark-Casey (justincc) | 2012-11-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | 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 | 12 | -321/+713 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | BulletSim: Make avatar capsule so it is not circular. | Robert Adams | 2012-11-21 | 6 | -21/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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). | ||||
| | * | | | Merge branch 'master' into careminster | Melanie | 2012-11-20 | 5 | -196/+169 |
| | |\ \ \ | | |/ / | |||||
| | | * | | 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 |
| | | | | | |||||
| | | * | | 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 |
| | | | | | |||||
| | * | | | Merge branch 'avination' into careminster | Melanie | 2012-11-20 | 5 | -18/+99 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | Merge branch 'teravuswork' into avination | Melanie | 2012-11-20 | 6 | -73/+491 |
| | | |\ \ | |||||
| | | | * | | * Plumbing and basic setting of the GetMesh Cap Throttler. | teravus | 2012-11-17 | 5 | -18/+99 |
| | | | | | | | | | | | | | | | | | | | | | * Last step is to flip the throttle distribution. | ||||
| | | | * | | Revert "Merge master into teravuswork", it should have been avination, not ↵ | teravus | 2012-11-15 | 159 | -15158/+6023 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |