| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | 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 | 5 | -134/+0 |
| | | | | | | | | | | | | | | | | | | | | | BulletSim libraries with code stripped of the obsolete code. | ||||
| * | | | | | Merge branch 'avination' into careminster | Melanie | 2012-11-17 | 13 | -49/+261 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | 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 |
| | |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | | * | | | removed potencial null refs and rearrange code a bit | UbitUmarov | 2012-11-04 | 1 | -13/+19 |
| | | | | | | |||||
| | | * | | | actually remove the use of random on persist timmings | UbitUmarov | 2012-11-02 | 1 | -4/+6 |
| | | | | | | |||||
| | | * | | | Create a new random when needed using normal time based seed instead of | UbitUmarov | 2012-11-02 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | reusing a shared one than may not be valid | ||||
| | | * | | | add debug position on bad primmesh error | UbitUmarov | 2012-11-02 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | This implements the Caps throttler. After some testing, the system seemed ↵ | teravus | 2012-11-05 | 1 | -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. | ||||
| | * | | | | Another step in the chain. Pipe the throttle update to the appropriate ↵ | teravus | 2012-11-05 | 2 | -13/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PollServiceTextureEventArgs. Each poll service having it's own throttle member is more consistent with the model then the region module keeping track of all of them globally and better for locking too. The Poll Services object is not set static to handle multiple nearby regions on the same simulator. Next step is hooking it up to HasEvents | ||||
| | * | | | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵ | teravus | 2012-11-04 | 8 | -3/+75 |
| | | | | | | | | | | | | | | | | | | | | | EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule. | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-17 | 38 | -1035/+1285 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | Remove old InventoryService, which has for a long time been replaced by ↵ | Justin Clark-Casey (justincc) | 2012-11-17 | 2 | -782/+0 |
| | | | | | | | | | | | | | | | | | | | | | XInventoryService. | ||||
| | * | | | | Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuid | Justin Clark-Casey (justincc) | 2012-11-17 | 5 | -27/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was necessary historically but hasn't been for many years. Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |