| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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. | ||||
| | | * | | Merge master into teravuswork | teravus | 2012-11-15 | 159 | -6023/+15158 |
| | | |\ \ | |||||
| * | | \ \ | Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster | Melanie | 2012-11-20 | 2 | -72/+409 |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | ||||
| | * | | | | * Prep work switching the GetMeshModule over to a poll service. | teravus | 2012-11-09 | 2 | -73/+410 |
| | | | | | | | | | | | | | | | | | | | | | * 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 | 6 | -352/+220 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | BulletSim: Use base class constructors for initialization of BSShape and ↵ | Robert Adams | 2012-11-18 | 4 | -216/+214 |
| | | | | | | | | | | | | | | | | | | | | | other classes. | ||||
| | * | | | | BulletSim: fix the problem with flying being disabled when crossing region ↵ | Robert Adams | 2012-11-18 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | boundries. | ||||
| | * | | | | BulletSim: remove the obsolete interface to the Bullet code. Update ↵ | Robert Adams | 2012-11-18 | 1 | -134/+0 |
| | | | | | | | | | | | | | | | | | | | | | BulletSim libraries with code stripped of the obsolete code. | ||||
| * | | | | | Merge branch 'avination' into careminster | Melanie | 2012-11-17 | 10 | -46/+254 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | Prevent a buffer overflow in asset receiving | Melanie | 2012-11-17 | 1 | -11/+20 |
| | | | | | | |||||
| | * | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-11-06 | 3 | -20/+31 |
| | |\ \ \ \ | | |_|/ / | |/| | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |