| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2012-10-26 | 1 | -12/+13 |
|\ |
|
| * | Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations sin... | Justin Clark-Casey (justincc) | 2012-10-26 | 1 | -15/+16 |
* | | Merge branch 'master' into careminster | Melanie | 2012-10-16 | 1 | -2/+6 |
|\ \
| |/ |
|
| * | minor: Add/correct some doc messages associated with entity teleport. | Justin Clark-Casey (justincc) | 2012-10-16 | 1 | -1/+6 |
* | | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 1 | -4/+4 |
|\ \
| |/ |
|
| * | Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it eas... | Justin Clark-Casey (justincc) | 2012-10-09 | 1 | -4/+4 |
* | | Merge branch 'master' into careminster | Melanie | 2012-10-07 | 1 | -5/+17 |
|\ \
| |/ |
|
| * | On receiving TaskInventoryAccepted with a destination folder in the binary bu... | Justin Clark-Casey (justincc) | 2012-10-06 | 1 | -5/+17 |
* | | Merge branch 'avination' into careminster | Melanie | 2012-09-27 | 1 | -1/+1 |
|\ \ |
|
| * | | Change the close tmeout from 2 to 3 seconds on teleport. This may | Melanie | 2012-09-16 | 1 | -1/+1 |
* | | | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster | Melanie | 2012-09-27 | 1 | -3/+5 |
|\ \ \
| | |/
| |/| |
|
| * | | Use GridUser properly for foreign users. | Diva Canto | 2012-09-26 | 1 | -0/+2 |
| * | | Oops, that should be inside the curly bracket. | Diva Canto | 2012-09-25 | 1 | -3/+3 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-09-24 | 1 | -0/+28 |
|\ \ \
| |/ / |
|
| * | | This fixes HG attachments' missing assets (textures, etc). | Diva Canto | 2012-09-21 | 1 | -0/+28 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-09-17 | 1 | -31/+59 |
|\ \ \
| |/ / |
|
| * | | HG2.0: Generalized the allowed HG appearances to be more than 1. | Diva Canto | 2012-09-16 | 1 | -31/+59 |
* | | | Merge branch 'avination' into careminster | Melanie | 2012-09-16 | 1 | -2/+2 |
|\ \ \
| | |/
| |/| |
|
| * | | Wait longer for arrival cofirmation to aid tps into laggy regions | Melanie | 2012-09-14 | 1 | -2/+2 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-09-16 | 2 | -3/+172 |
|\ \ \
| | |/
| |/| |
|
| * | | More on HG2.0: added the possibility of controlling the appearance that avies... | Diva Canto | 2012-09-15 | 2 | -2/+171 |
* | | | Merge branch 'avination' into careminster | Melanie | 2012-09-10 | 1 | -94/+116 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-04 | 1 | -0/+6 |
| |\ \ |
|
| | * | | let avatar keep flying in tps to same region. (still bad for other | UbitUmarov | 2012-09-04 | 1 | -0/+6 |
| * | | | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated into | Melanie | 2012-09-04 | 1 | -94/+110 |
| |/ / |
|
* | | | Merge branch 'avination' into careminster | Melanie | 2012-08-31 | 1 | -2/+10 |
|\ \ \
| |/ / |
|
| * | | [possible still very broken] mess around keyframes. timer events | UbitUmarov | 2012-08-28 | 1 | -2/+10 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-08-23 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Add --force flag to "kick user" console command to allow bypassing of recent ... | Justin Clark-Casey (justincc) | 2012-08-20 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2012-06-28 | 1 | -17/+31 |
|\ \
| |/ |
|
| * | Add regression test to check that attachments in source region are deleting w... | Justin Clark-Casey (justincc) | 2012-06-26 | 1 | -0/+5 |
| * | If crossing attachments into another region pre-fatpack, clone objects before... | Justin Clark-Casey (justincc) | 2012-06-26 | 1 | -17/+26 |
* | | Merge branch 'master' into careminster | Melanie | 2012-06-12 | 1 | -25/+21 |
|\ \
| |/ |
|
| * | OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather... | Justin Clark-Casey (justincc) | 2012-06-12 | 1 | -25/+21 |
* | | Merge branch 'master' into careminster | Melanie | 2012-06-08 | 1 | -1/+0 |
|\ \
| |/ |
|
| * | Don't make duplicate call to ScenePresence.Close() separately in ETM.DoTelepo... | Justin Clark-Casey (justincc) | 2012-06-08 | 1 | -1/+0 |
* | | Reverse the logic of a conditional. Clears up a merge artefact. | Melanie | 2012-06-06 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2012-05-29 | 3 | -238/+332 |
|\ \
| |/ |
|
| * | refactor: factor out entity transfer state machine into a separate class to m... | Justin Clark-Casey (justincc) | 2012-05-28 | 3 | -239/+330 |
| * | If handling the failure of teleport, move agent state to CleaningUp when we s... | Justin Clark-Casey (justincc) | 2012-05-28 | 1 | -3/+6 |
* | | Merge branch 'master' into careminster | Melanie | 2012-05-27 | 2 | -358/+519 |
|\ \
| |/ |
|
| * | Resolve some mono compiler warnings. | Justin Clark-Casey (justincc) | 2012-05-25 | 2 | -2/+2 |
| * | on agent cross, remove from physics scene after its been placed in transit, n... | Justin Clark-Casey (justincc) | 2012-05-25 | 1 | -3/+7 |
| * | refactor: make ETM.CrossAgentToNewRegionAsync neighbourRegion == null check r... | Justin Clark-Casey (justincc) | 2012-05-25 | 1 | -90/+92 |
| * | Stop it being possible for an agent to teleport back to its source region bef... | Justin Clark-Casey (justincc) | 2012-05-25 | 1 | -24/+165 |
| * | Don't actually proceed on a within-region teleport if another is already taki... | Justin Clark-Casey (justincc) | 2012-05-24 | 1 | -0/+2 |
| * | On inter-region teleport, only stand the avatar up if the QueryAccess call to... | Justin Clark-Casey (justincc) | 2012-05-24 | 1 | -7/+7 |
| * | Now that the EntityTransferModule is per-region, fetch the event queue module... | Justin Clark-Casey (justincc) | 2012-05-24 | 1 | -18/+22 |
| * | Fix issue where a dns resolution failure on the final destination might leave... | Justin Clark-Casey (justincc) | 2012-05-24 | 1 | -192/+200 |
| * | If an agent is still registered as 'in transit' by the source region, don't a... | Justin Clark-Casey (justincc) | 2012-05-24 | 2 | -66/+58 |