aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'careminster' into avinationMelanie2012-11-237-33/+129
|\
| * Merge branch 'master' into careminsterMelanie2012-11-237-33/+129
| |\
| | * Remove the redundant BypassPermissions() checks in EstateManagmentModule.Justin Clark-Casey (justincc)2012-11-231-8/+13
| | * minor: Add some console feedback on region restart and log who requested a re...Justin Clark-Casey (justincc)2012-11-232-1/+9
| | * Fix problem where restarting the currently selected region would stop various...Justin Clark-Casey (justincc)2012-11-234-36/+51
| | * 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
* | 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
* | Merge branch 'master' into careminsterMelanie2012-11-2211-54/+54
|\ \ | |/
| * Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because itMelanie2012-11-2211-54/+54
* | Merge branch 'master' into careminsterMelanie2012-11-223-223/+30
|\ \ | |/
| * Factor out command script code.Justin Clark-Casey (justincc)2012-11-221-36/+0
| * 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
| * 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
* | | Merge branch 'master' into careminsterMelanie2012-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
* | | Merge branch 'master' into careminsterMelanie2012-11-205-196/+169
|\ \ \ | |/ /
| * | 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
* | | Merge branch 'avination' into careminsterMelanie2012-11-205-18/+99
|\ \ \ | | |/ | |/|
| * | Merge branch 'teravuswork' into avinationMelanie2012-11-206-73/+491
| |\ \
| | * | * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-175-18/+99
| | * | Revert "Merge master into teravuswork", it should have been avination, not ma...teravus2012-11-15159-15158/+6023
| | * | Merge master into teravusworkteravus2012-11-15159-6023/+15158
| | |\ \
* | | \ \ Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-202-72/+409
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | * Prep work switching the GetMeshModule over to a poll service.teravus2012-11-092-73/+410
* | | | | 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-1710-46/+254
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Prevent a buffer overflow in asset receivingMelanie2012-11-171-11/+20
| * | | | Merge branch 'ubitwork' into avinationMelanie2012-11-063-20/+31
| |\ \ \ \ | | |_|/ / | |/| | |