aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-071-2/+2
|\
| * fix regressionUbitUmarov2012-12-071-2/+2
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-071-4/+25
|\ \ | |/
| * *TEST* add some avatar skeleton information and use it to calculate avatarUbitUmarov2012-12-071-4/+25
| | | | | | | | height and bounding box. Change LSL acording.
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-064-105/+85
|\ \ | |/
| * avatar collision plane send to viewer is only relative to feet. changeUbitUmarov2012-12-054-105/+85
| | | | | | | | avatar collider, just rounding the boxes, etc
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-043-14/+47
|\ \ | |/
| * move characters (avatars) to own collision space, also fixing a problemUbitUmarov2012-12-043-14/+47
| | | | | | | | with previus code that was still assuming the avatar is g2
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-041-4/+4
|\ \ | |/
| * raise standing avatar a bit to reduce knees bending on some collisions.UbitUmarov2012-12-041-4/+4
| | | | | | | | reduce head size a bit
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-03311-10116/+20710
|\ \ | |/
| * Merge branch 'avination' into ubitworkMelanie2012-12-036-107/+383
| |\
| | * *TEST* diferent avatar colliderUbitUmarov2012-12-033-103/+350
| | |
| | * fix vertex rounding directionUbitUmarov2012-12-031-1/+8
| | |
| | * *TEST* reduce all mesh vertices resolution to 1e-5. This reduces numberUbitUmarov2012-12-031-0/+16
| | | | | | | | | | | | of unique vertices only originated by math errors in PrimMesher
| | * adjust avatar standing Z positionUbitUmarov2012-12-031-5/+11
| | |
| | * Add a transaction ID to the money module path for llTransferLindenDollarsMelanie2012-12-032-3/+3
| | |
| * | don't zero constant force and torque in selectionUbitUmarov2012-11-241-6/+6
| | |
| * | avoid potencial NullReferenceExceptionUbitUmarov2012-11-241-2/+5
| |/
| * Remove a superfluous newline from helpMelanie2012-11-231-2/+2
| |
| * Merge branch 'careminster' into avinationMelanie2012-11-237-33/+129
| |\
| | * Merge branch 'master' into careminsterMelanie2012-11-237-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-231-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-232-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-234-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 closeJustin Clark-Casey (justincc)2012-11-231-0/+58
| | | |
| * | | Remove duplicate registration of the help topics for the module commanderMelanie2012-11-231-5/+5
| |/ /
| * | Fix a build break introduced by us having a more efficient DoubleDictionaryMelanie2012-11-231-4/+8
| | | | | | | | | | | | where core has a simple list
| * | Merge branch 'master' into careminsterMelanie2012-11-231-0/+7
| |\ \ | | |/
| | * Fix regression where we stopped closing scenes on simulator exit.Justin Clark-Casey (justincc)2012-11-231-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 careminsterMelanie2012-11-2211-54/+54
| |\ \ | | |/
| | * Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because itMelanie2012-11-2211-54/+54
| | | | | | | | | | | | conflicts with PhysicsShape type defined in later libOMV
| * | Merge branch 'master' into careminsterMelanie2012-11-223-223/+30
| |\ \ | | |/
| | * Factor out command script code.Justin Clark-Casey (justincc)2012-11-221-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 serversJustin Clark-Casey (justincc)2012-11-223-171/+29
| | |
| | * Make "show info" command available across all serversJustin Clark-Casey (justincc)2012-11-221-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-221-1/+1
| | |
| * | Merge branch 'avination' into careminsterMelanie2012-11-221-7/+35
| |\ \
| | * | * While this is not producing any problems.. and does help in low bandwidth ↵teravus2012-11-221-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 careminsterMelanie2012-11-2212-321/+713
| |\ \ \ | | | |/ | | |/|
| | * | BulletSim: Make avatar capsule so it is not circular.Robert Adams2012-11-216-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 Adams2012-11-212-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 Adams2012-11-213-5/+46
| | | |
| | * | BulletSim: fix line endings to be all Linux style (windows style keeps ↵Robert Adams2012-11-212-454/+454
| | | | | | | | | | | | | | | | creeping in)
| | * | BulletSim: enablement and debugging of mesh terrain.Robert Adams2012-11-214-36/+253
| | | |
| | * | BulletSim: pull heightmap implementation out of the terrain manager so a ↵Robert Adams2012-11-214-181/+327
| | | | | | | | | | | | | | | | mesh terrain can be implemented.
| | * | BulletSim: rename SHAPE_AVATAR to SHAPE_CAPSULE with the eye to eventually ↵Robert Adams2012-11-214-8/+8
| | | | | | | | | | | | | | | | having mesh avatars.
| | * | BulletSim: uplevel FixedShapeKey out of ShapeData structure (since it is ↵Robert Adams2012-11-213-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 Adams2012-11-219-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 Adams2012-11-212-33/+30
| | | | | | | | | | | | | | | | corrections (below ground and floating).