| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2013-08-11 | 3 | -137/+368 |
|\ |
|
| * | 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 | 2 | -115/+235 |
| |\ |
|
| | * | 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 | 2 | -116/+228 |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-08-09 | 2 | -22/+35 |
| |\ \ |
|
| | * | | Make m_originRegionID in ScenePresence public to allow DSG module to work for... | Dan Lake | 2013-08-08 | 1 | -2/+2 |
| | |/ |
|
| * | | 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 | 3 | -38/+63 |
|\ \ \
| | |/
| |/| |
|
| * | | minor: add some method doc to ScenePresence fields used for entity transfer, ... | Justin Clark-Casey (justincc) | 2013-08-07 | 2 | -20/+33 |
| |/ |
|
| * | Fixed incomplete commit r/23317 -- see_into_region. Put the guard around esta... | Diva Canto | 2013-08-07 | 1 | -16/+16 |
| * | Child agent updates: remove the dependency on the root agent's camera positio... | Diva Canto | 2013-08-05 | 1 | -2/+1 |
| * | More on HG inventory and OutboundPermission: disallowing giving inventory to ... | Diva Canto | 2013-08-03 | 1 | -0/+3 |
| * | HG: If OutboundPermission is set to false, let's enforce stricter permissions... | Diva Canto | 2013-08-03 | 1 | -0/+3 |
| * | Turn off edit beams when object is derezed while being edited. (mantis #6722) | Diva Canto | 2013-08-01 | 1 | -0/+6 |
* | | Merge branch 'master' into careminster | Melanie | 2013-07-29 | 4 | -51/+66 |
|\ \
| |/ |
|
| * | Fix failure in TestCreateDuplicateRootScenePresence(). | Justin Clark-Casey (justincc) | 2013-07-26 | 1 | -0/+13 |
| * | Fix regression tests relating to agent transfer by making simulator use last ... | Justin Clark-Casey (justincc) | 2013-07-26 | 1 | -0/+6 |
| * | Fix NPC regression test failures. | Justin Clark-Casey (justincc) | 2013-07-26 | 1 | -1/+3 |
| * | Comment debug message | Diva Canto | 2013-07-26 | 1 | -2/+2 |
| * | This should fix all issues with teleports. One should be able to TP as fast a... | Diva Canto | 2013-07-25 | 1 | -32/+29 |
| * | Reset DoNotClose scene presence teleport flag before pausing. Rename DoNotCl... | Justin Clark-Casey (justincc) | 2013-07-26 | 2 | -2/+2 |
| * | If a returning teleport starts to reuse a downgraded child connection that wa... | Justin Clark-Casey (justincc) | 2013-07-26 | 2 | -11/+25 |
* | | Merge branch 'master' into careminster | Melanie | 2013-07-25 | 2 | -58/+99 |
|\ \
| |/ |
|
| * | Moved TriggerOnMakeRootAgent back to the end of MakeRootAgent, to see if that... | Diva Canto | 2013-07-24 | 1 | -7/+2 |
| * | Minor adjustment on timings of waits. | Diva Canto | 2013-07-24 | 1 | -2/+2 |
| * | This commit message intentionally left blank (last commit was idiotic) | Diva Canto | 2013-07-24 | 1 | -1/+2 |
| * | Improve the opening test in CompleteMovement, to account for multiple flags b... | Diva Canto | 2013-07-24 | 1 | -1/+1 |
| * | New Teleport protocol (V2), still compatible with V1 and older. (version of t... | Diva Canto | 2013-07-24 | 2 | -6/+45 |
| * | Further tweaks on TPs: not sending the callback URL and instead waiting 15sec... | Diva Canto | 2013-07-24 | 1 | -1/+1 |
| * | Amend previous commit. | Diva Canto | 2013-07-24 | 1 | -4/+4 |
| * | Added config var that we all thought was already there: see_into_region. (Not... | Diva Canto | 2013-07-24 | 1 | -34/+45 |
* | | Merge branch 'master' into careminster | Melanie | 2013-07-24 | 4 | -35/+125 |
|\ \
| |/ |
|
| * | Restoring landing on prims, which had been affected by the edit beams commit. | Diva Canto | 2013-07-23 | 1 | -0/+19 |
| * | Don't post Link asset types back to the home grid | Diva Canto | 2013-07-23 | 2 | -5/+5 |
| * | Minor aesthetic change to make things more clear. | Diva Canto | 2013-07-21 | 1 | -1/+2 |
| * | EDIT BEAMS!!! They had been missing from OpenSim since ever. Thanks to lkalif... | Diva Canto | 2013-07-21 | 1 | -1/+4 |
| * | Filter certain viewer effects depending on distance between the avatar that i... | Diva Canto | 2013-07-21 | 1 | -7/+25 |
| * | A couple of small optimizations over the previous commit | Diva Canto | 2013-07-21 | 1 | -1/+1 |
| * | Manage AgentUpdates more sanely: | Diva Canto | 2013-07-21 | 1 | -40/+70 |
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... | Melanie | 2013-07-18 | 1 | -2/+5 |
|\ \ |
|
| * \ | Merge branch 'master' into careminster | Melanie | 2013-07-13 | 1 | -8/+12 |
| |\ \ |
|
| * \ \ | Merge branch 'master' into careminster | Melanie | 2013-07-13 | 7 | -73/+159 |
| |\ \ \ |
|
* | \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-07-18 | 10 | -85/+194 |
|\ \ \ \ \
| |/ / / /
|/| | | /
| | |_|/
| |/| | |
|
| * | | | Let's go easy on authenticating ChildAgentUpdates, otherwise this will be cha... | Diva Canto | 2013-07-14 | 1 | -7/+5 |
| * | | | Fix broken tests -- the test setup was wrong... sigh. | Diva Canto | 2013-07-14 | 1 | -0/+1 |
| * | | | Authenticate ChildAgentUpdate too. | Diva Canto | 2013-07-14 | 2 | -16/+29 |
| * | | | Change the auth token to be the user's sessionid. | Diva Canto | 2013-07-14 | 2 | -3/+3 |
| * | | | And this fixes the other failing tests. Justin, the thread pool is not being ... | Diva Canto | 2013-07-13 | 1 | -2/+0 |