aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-2212-706/+604
|\
| * Factor out command script code.Justin Clark-Casey (justincc)2012-11-223-77/+50
| * Make "config show/set/get/save" console commands available on all serversJustin Clark-Casey (justincc)2012-11-226-189/+172
| * Factor out common pid file creation and removal code.Justin Clark-Casey (justincc)2012-11-223-62/+50
| * Add "get log level" command - this returns the current server session console...Justin Clark-Casey (justincc)2012-11-221-19/+31
| * Remove unused BaseOpenSimServer.ShowHelp()Justin Clark-Casey (justincc)2012-11-221-21/+0
| * Make "set log level" command available across all serversJustin Clark-Casey (justincc)2012-11-223-32/+31
| * Make "show info" command available across all serversJustin Clark-Casey (justincc)2012-11-224-237/+185
| * Factor out common registration of "show uptime" commandJustin Clark-Casey (justincc)2012-11-223-71/+78
| * 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
* | | 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-2214-324/+835
|\ \ \ | |/ /
| * | If an asset POST does not contain well-formed XML, return a 400 (Bad Request)...Justin Clark-Casey (justincc)2012-11-222-3/+38
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-11-2212-321/+713
| |\ \
| | * | BulletSim: Make avatar capsule so it is not circular.Robert Adams2012-11-216-21/+39
| | * | BulletSim: Properly position mesh terrain on creation (fixes terrain not appe...Robert Adams2012-11-212-76/+44
| | * | 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 creepi...Robert Adams2012-11-212-454/+454
| | * | BulletSim: enablement and debugging of mesh terrain.Robert Adams2012-11-214-36/+253
| | * | BulletSim: pull heightmap implementation out of the terrain manager so a mesh...Robert Adams2012-11-214-181/+327
| | * | BulletSim: rename SHAPE_AVATAR to SHAPE_CAPSULE with the eye to eventually ha...Robert Adams2012-11-214-8/+8
| | * | BulletSim: uplevel FixedShapeKey out of ShapeData structure (since it is gett...Robert Adams2012-11-213-20/+22
| | * | BulletSim: uplevel PhysicsShapeType out of ShapeData structure (since it is g...Robert Adams2012-11-219-66/+67
| | * | BulletSim: change PositionSanityCheck to apply a force to correct position co...Robert Adams2012-11-212-33/+30
| | * | BulletSim: tweek avatar capsule parameters so avatar feet don't go below grou...Robert Adams2012-11-212-8/+10
| * | | Add regression test for a good request made to the asset service post handler.Justin Clark-Casey (justincc)2012-11-211-0/+84
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-11-206-198/+174
|\ \ \ | |/ /
| * | If GetAgents() is called with an empty userIDs array then don't bother with a...Justin Clark-Casey (justincc)2012-11-201-0/+4
| * | refactor: Move common presence connector code into BasePresenceServiceConnectorJustin Clark-Casey (justincc)2012-11-204-193/+145
| * | Minor formatting for 0962a35d and a few one-line comments as to why that code...Justin Clark-Casey (justincc)2012-11-201-8/+7
| * | Fix movetotarget on mega regions.Iain Oliver2012-11-201-3/+21
| * | minor: If logging full incoming HTTP data, don't deceptively print ... at the...Justin Clark-Casey (justincc)2012-11-201-2/+5
* | | Merge branch 'avination' into careminsterMelanie2012-11-208-19/+127
|\ \ \ | | |/ | |/|
| * | Merge branch 'teravuswork' into avinationMelanie2012-11-2010-79/+655
| |\ \
| | * | * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-178-19/+127
| | * | Revert "Merge master into teravuswork", it should have been avination, not ma...teravus2012-11-15236-17948/+6954
| | * | Merge master into teravusworkteravus2012-11-15236-6954/+17948
| | |\ \
* | | \ \ Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-204-78/+546
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | * 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
* | | | | Merge branch 'master' into careminsterMelanie2012-11-196-352/+220
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | BulletSim: Use base class constructors for initialization of BSShape and othe...Robert Adams2012-11-184-216/+214
| * | | | BulletSim: fix the problem with flying being disabled when crossing region bo...Robert Adams2012-11-181-2/+6
| * | | | BulletSim: remove the obsolete interface to the Bullet code. Update BulletSim...Robert Adams2012-11-181-134/+0
* | | | | 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
| |\ \ \ \ | | |_|/ / | |/| | |