aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * factor out common HandleShow code for "show uptime"Justin Clark-Casey (justincc)2012-11-229-63/+72
| |
* | 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-223-48/+66
|\ \ \ | | |/ | |/|
| * | refactor: Factor out copy/pasted server uptime report codeJustin Clark-Casey (justincc)2012-11-223-48/+66
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-2221-325/+893
|\ \ \ | |/ /
| * | If an asset POST does not contain well-formed XML, return a 400 (Bad ↵Justin Clark-Casey (justincc)2012-11-222-3/+38
| | | | | | | | | | | | Request) HTTP status rather than simply dropping the request.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-11-2217-322/+715
| |\ \
| | * | BulletSim: update DLLs and SOs. No functional changes. Only the parameter ↵Robert Adams2012-11-214-0/+0
| | | | | | | | | | | | | | | | block format changed.
| | * | BulletSim: Make avatar capsule so it is not circular.Robert Adams2012-11-217-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 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).
| | * | BulletSim: tweek avatar capsule parameters so avatar feet don't go below ↵Robert Adams2012-11-212-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-213-0/+140
| |/ / | | | | | | | | | Adds new OpenSim.Server.Handlers.Tests.dll to test suite
* | | Merge branch 'master' into careminsterMelanie2012-11-209-213/+197
|\ \ \ | |/ /
| * | If GetAgents() is called with an empty userIDs array then don't bother with ↵Justin Clark-Casey (justincc)2012-11-201-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 BasePresenceServiceConnectorJustin Clark-Casey (justincc)2012-11-204-193/+145
| | |
| * | Add Iain Oliver to CONTRIBUTORS.txtJustin Clark-Casey (justincc)2012-11-201-0/+1
| | |
| * | Minor formatting for 0962a35d and a few one-line comments as to why that ↵Justin Clark-Casey (justincc)2012-11-201-8/+7
| | | | | | | | | | | | code is there
| * | Fix movetotarget on mega regions.Iain Oliver2012-11-201-3/+21
| | |
| * | minor: If logging full incoming HTTP data, don't deceptively print ... at ↵Justin Clark-Casey (justincc)2012-11-201-2/+5
| | | | | | | | | | | | the end of the body.
| * | Expose configuration options for the XmlRpcGridRouterBlueWall2012-11-192-15/+22
| | | | | | | | | | | | Expose configuration options for the XmlRpcGridRouter to allow simulators to register llRemoteData channels with an external routing service
* | | Merge branch 'avination' into careminsterMelanie2012-11-208-19/+127
|\ \ \ | | |/ | |/|
| * | Merge branch 'teravuswork' into avinationMelanie2012-11-2011-82/+668
| |\ \
| | * | * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-178-19/+127
| | | | | | | | | | | | | | | | * Last step is to flip the throttle distribution.
* | | | Merge commit 'e9153e1d1aae50024d8cd05fe14a9bce34343a0e' into careminsterMelanie2012-11-200-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-15337-30953/+13136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
| * | | Merge master into teravusworkteravus2012-11-15336-13123/+30950
| |\ \ \
* | \ \ \ Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-204-78/+546
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
| * | | | * Fixes mesh loading issues in last commit.teravus2012-11-151-0/+9
| | | | |
| * | | | * Prep work switching the GetMeshModule over to a poll service.teravus2012-11-094-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 careminsterMelanie2012-11-1910-352/+220
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | BulletSim: Use base class constructors for initialization of BSShape and ↵Robert Adams2012-11-184-216/+214
| | | | | | | | | | | | | | | | | | | | other classes.
| * | | | BulletSim: fix the problem with flying being disabled when crossing region ↵Robert Adams2012-11-181-2/+6
| | | | | | | | | | | | | | | | | | | | boundries.
| * | | | BulletSim: remove the obsolete interface to the Bullet code. Update ↵Robert Adams2012-11-185-134/+0
| | | | | | | | | | | | | | | | | | | | BulletSim libraries with code stripped of the obsolete code.
* | | | | Merge branch 'avination' into careminsterMelanie2012-11-1713-49/+261
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Prevent a buffer overflow in asset receivingMelanie2012-11-171-11/+20
| | | | |
| * | | | Merge branch 'ubitwork' into avinationMelanie2012-11-063-20/+31
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | removed potencial null refs and rearrange code a bitUbitUmarov2012-11-041-13/+19
| | | | |
| | * | | actually remove the use of random on persist timmingsUbitUmarov2012-11-021-4/+6
| | | | |
| | * | | Create a new random when needed using normal time based seed instead ofUbitUmarov2012-11-021-2/+5
| | | | | | | | | | | | | | | | | | | | reusing a shared one than may not be valid
| | * | | add debug position on bad primmesh errorUbitUmarov2012-11-021-2/+2
| | | | |
| * | | | This implements the Caps throttler. After some testing, the system seemed ↵teravus2012-11-051-13/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be OK with me specifying allowing 1 oversized image per 70,000b/sec with at least one. Try it out, start with a low bandwidth setting and then, set your bandwidth setting middle/high and see the difference. Tested with Two Clients on a region with 1800 textures all visible at once.