| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2013-08-13 | 15 | -42/+246 |
|\ |
|
| * | minor: Eliminate one of the duplicate 'have's in the HG message telling the u... | Justin Clark-Casey (justincc) | 2013-08-13 | 1 | -1/+1 |
| * | Remove exception when printing error for failure removing script state. | Robert Adams | 2013-08-13 | 1 | -1/+1 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-08-12 | 4 | -13/+26 |
| |\ |
|
| | * | BulletSim: add check in avatar stair step code to verify the collision | Robert Adams | 2013-08-12 | 4 | -13/+26 |
| * | | Make show bots pCampbot console command print connected, connecting, etc. bot... | Justin Clark-Casey (justincc) | 2013-08-12 | 1 | -0/+13 |
| |/ |
|
| * | Don't try and send group updates to NPCs via event queue, since NPCs have no ... | Justin Clark-Casey (justincc) | 2013-08-12 | 2 | -4/+7 |
| * | minor: Extend warning message when adding trying to add an event for a client... | Justin Clark-Casey (justincc) | 2013-08-12 | 1 | -3/+8 |
| * | Get rid of issue where removing NPCs would through an exception by routing cl... | Justin Clark-Casey (justincc) | 2013-08-12 | 1 | -1/+3 |
| * | Add none behaviour to pCampbot when one wants bots to just stand around | Justin Clark-Casey (justincc) | 2013-08-12 | 3 | -10/+57 |
| * | Create TestSameSimulatorNeighbouringRegionsTeleportV2() regression test for V... | Justin Clark-Casey (justincc) | 2013-08-12 | 2 | -9/+130 |
* | | Merge branch 'master' into careminster | Melanie | 2013-08-11 | 25 | -362/+869 |
|\ \
| |/ |
|
| * | Stats treaking. Update ToOSDMap for Stat and PercentageStat to return | Robert Adams | 2013-08-10 | 4 | -150/+235 |
| * | minor: Consistently log IOCP for IO completion thread startup log information... | Justin Clark-Casey (justincc) | 2013-08-09 | 1 | -3/+3 |
| * | Increase wait for source region to sent UpdateAgent to 10 seconds instead of 4. | Justin Clark-Casey (justincc) | 2013-08-09 | 1 | -1/+1 |
| * | Add missing file from b1c26a56 | Justin Clark-Casey (justincc) | 2013-08-09 | 1 | -0/+102 |
| * | Merge branch 'TeleportWork' | Justin Clark-Casey (justincc) | 2013-08-09 | 8 | -134/+268 |
| |\ |
|
| | * | Comment back out seed dump code enabled in b1c26a56. Also adds a few telepor... | Justin Clark-Casey (justincc) | 2013-08-09 | 1 | -16/+22 |
| | * | Fix an issue with an A->C->B->A teleport where these regions are in a row (A,... | Justin Clark-Casey (justincc) | 2013-08-09 | 1 | -0/+8 |
| | * | Fix an issue where under teleport v2 protocol, teleporting from regions in an... | Justin Clark-Casey (justincc) | 2013-08-08 | 8 | -147/+267 |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-08-09 | 16 | -81/+300 |
| |\ \ |
|
| | * | | BulletSim: adjust avatar position when the avatar's size is changed. | Robert Adams | 2013-08-08 | 2 | -4/+12 |
| | * | | Make m_originRegionID in ScenePresence public to allow DSG module to work for... | Dan Lake | 2013-08-08 | 1 | -2/+2 |
| | * | | Add parameter and explanation of ManagedStats return to OpenSimDefaults.ini. | Robert Adams | 2013-08-08 | 3 | -2/+15 |
| | * | | Better error reporting when registering LSL function extensions (comms module). | Robert Adams | 2013-08-08 | 1 | -4/+13 |
| | * | | Add a JSON web fetch of the statististics managed by StatsManager. | Robert Adams | 2013-08-08 | 3 | -0/+40 |
| | * | | * Added set water height <height> [<x>] [<y>] console command following the s... | teravus | 2013-08-07 | 1 | -1/+30 |
| | * | | * This makes in-world terrain editing smoother, even in MegaRegions. This ... | teravus | 2013-08-07 | 1 | -3/+30 |
| | |/ |
|
| | * | minor: Remove console lines at bottom of FakeParcelIDTests() regression test ... | Justin Clark-Casey (justincc) | 2013-08-08 | 1 | -2/+0 |
| | * | Fixed error in BuildFakeParcelID() which was detected by regression tests. | Kevin Cozens | 2013-08-08 | 1 | -2/+2 |
| | * | Added regression tests for the routines related to fake parcel IDs. | Kevin Cozens | 2013-08-08 | 1 | -0/+84 |
| | * | Additional regression tests for the location routines in Location.cs | Kevin Cozens | 2013-08-08 | 1 | -0/+7 |
| | * | Remove never implemented stub modules commands (list, load, unload) from back... | Justin Clark-Casey (justincc) | 2013-08-08 | 1 | -40/+0 |
| * | | Go easy on enforcing session ids in position updates | Diva Canto | 2013-08-09 | 1 | -16/+17 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-08-07 | 47 | -223/+1441 |
|\ \ \
| | |/
| |/| |
|
| * | | minor: add some method doc to ScenePresence fields used for entity transfer, ... | Justin Clark-Casey (justincc) | 2013-08-07 | 4 | -25/+48 |
| * | | Add post-CreateAgent teleport cancellation/abortion functionality from v1 tra... | Justin Clark-Casey (justincc) | 2013-08-07 | 1 | -0/+21 |
| |/ |
|
| * | Amend to last commit -- remove the obsolete var from OpenSim.ini.example | Diva Canto | 2013-08-07 | 1 | -4/+0 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-08-07 | 7 | -13/+270 |
| |\ |
|
| | * | Add file missing from last commit 4c2f6de | Justin Clark-Casey (justincc) | 2013-08-06 | 1 | -0/+108 |
| | * | Add the experimental ability to dump stats (result of command "show stats all... | Justin Clark-Casey (justincc) | 2013-08-06 | 5 | -13/+139 |
| | * | Add "debug threadpool status" console command to show min/max/current worker/... | Justin Clark-Casey (justincc) | 2013-08-06 | 1 | -0/+23 |
| * | | Fixed incomplete commit r/23317 -- see_into_region. Put the guard around esta... | Diva Canto | 2013-08-07 | 3 | -18/+16 |
| |/ |
|
| * | Add "debug comms status" command to show current debug comms settings | Justin Clark-Casey (justincc) | 2013-08-05 | 1 | -0/+11 |
| * | Make it possible to switch whether we serialize osd requests per endpoint or ... | Justin Clark-Casey (justincc) | 2013-08-05 | 3 | -5/+74 |
| * | For LLImageManagerTests, make tests execute under synchronous fire and forget... | Justin Clark-Casey (justincc) | 2013-08-05 | 1 | -8/+12 |
| * | minor: move "threads abort" and "force gc" console commands into debug catego... | Justin Clark-Casey (justincc) | 2013-08-05 | 1 | -2/+2 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-08-05 | 1 | -2/+1 |
| |\ |
|
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-08-05 | 10 | -24/+437 |
| | |\ |
|
| | * | | Child agent updates: remove the dependency on the root agent's camera positio... | Diva Canto | 2013-08-05 | 1 | -2/+1 |