| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2011-12-24 | 4 | -11/+6 |
|\ |
|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-12-23 | 8 | -37/+97 |
| |\ |
|
| | * | remove the old region crossing handler | Mic Bowman | 2011-12-23 | 1 | -10/+0 |
| * | | HG: AAdded a few missing /'s at the end of URLs | Diva Canto | 2011-12-23 | 3 | -1/+6 |
* | | | Merge branch 'master' into careminster | Melanie | 2011-12-23 | 4 | -28/+83 |
|\ \ \
| | |/
| |/| |
|
| * | | Fixes some problems with objects that attempt to cross a region boundary | Mic Bowman | 2011-12-22 | 1 | -0/+24 |
| * | | fix the UsesPhysics flag to reference the physics flag rather than the tempon... | Mic Bowman | 2011-12-22 | 1 | -1/+1 |
| * | | Enables processing of hypergrid links through simiangrid services. Thanks | Mic Bowman | 2011-12-22 | 1 | -25/+56 |
| * | | Align default ODE_STEPSIZE with that already used through OpenSimDefaults.ini | Justin Clark-Casey (justincc) | 2011-12-22 | 1 | -2/+2 |
* | | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 5 | -8/+23 |
|\ \ \
| |/ / |
|
| * | | rename Scene.m_physicalPrim to PhysicalPrims since its public and access exte... | Justin Clark-Casey (justincc) | 2011-12-22 | 2 | -3/+3 |
| * | | Remove unused m_physicalPrim parameter from SOG.ApplyPhysics() | Justin Clark-Casey (justincc) | 2011-12-22 | 2 | -4/+2 |
| * | | Make it possible to force all prims to be phantom via the collidable_prim boo... | Justin Clark-Casey (justincc) | 2011-12-22 | 3 | -1/+18 |
| |/ |
|
* | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -39/+32 |
|\ \
| |/ |
|
| * | Region crossings redone: (1) removed WaitForCallback. Now that we are passing... | Diva Canto | 2011-12-22 | 1 | -39/+32 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | And a typo fix | Melanie | 2011-12-22 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -1/+6 |
|\ \
| |/ |
|
| * | Add a few comments, correct a merge artefact | Melanie | 2011-12-22 | 1 | -1/+6 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 0 | -0/+0 |
|\ \
| |/ |
|
| * | Harmonizing SP with Avination | Melanie | 2011-12-22 | 1 | -41/+55 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 13 | -152/+134 |
|\ \
| |/ |
|
| * | Fixing a bug introduced yesterday. This put the precondition test inside Chec... | Diva Canto | 2011-12-22 | 1 | -105/+109 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-12-21 | 12 | -39/+15 |
| |\ |
|
| | * | Remove unused SetAcceleration and add set on Acceleration parameter | Dan Lake | 2011-12-20 | 11 | -35/+14 |
| * | | Moved an external test into the method that uses those preconditions. | Diva Canto | 2011-12-21 | 1 | -19/+11 |
| * | | HG: Verify that the user is local | Diva Canto | 2011-12-21 | 1 | -0/+8 |
* | | | Merge branch 'master' into careminster | Melanie | 2011-12-20 | 4 | -9/+9 |
|\ \ \
| | |/
| |/| |
|
| * | | Though the viewer warns about receiving this, not sending appears to break ba... | Justin Clark-Casey (justincc) | 2011-12-20 | 1 | -4/+1 |
| |/ |
|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-12-20 | 23 | -283/+304 |
| |\ |
|
| * | | Fixed bug of avie going under the terrain when crossing regions in certain di... | Diva Canto | 2011-12-20 | 1 | -2/+2 |
| * | | Changed the async approach on close child agents. This may improve crossings ... | Diva Canto | 2011-12-16 | 2 | -7/+7 |
| * | | Commented a couple of verbose debug messages. | Diva Canto | 2011-12-16 | 2 | -2/+2 |
* | | | Merge branch 'master' into careminster | Melanie | 2011-12-19 | 3 | -36/+44 |
|\ \ \
| | |/
| |/| |
|
| * | | Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs a... | Justin Clark-Casey (justincc) | 2011-12-19 | 3 | -36/+44 |
* | | | Merge branch 'master' into careminster | Melanie | 2011-12-19 | 8 | -62/+108 |
|\ \ \
| |/ / |
|
| * | | Stop sending the viewer its own AvatarAppearance packet. | Justin Clark-Casey (justincc) | 2011-12-19 | 1 | -1/+4 |
| * | | Stop unnecessarily sending the TextureEntry in client avatar updates. | Justin Clark-Casey (justincc) | 2011-12-19 | 1 | -1/+7 |
| * | | Fix race condition where the appearance update timer could be stopped just af... | Justin Clark-Casey (justincc) | 2011-12-19 | 1 | -3/+6 |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-12-19 | 1 | -1/+1 |
| |\ \ |
|
| | * | | addresses mantis #5827 | nebadon | 2011-12-19 | 1 | -1/+1 |
| * | | | Migrate detailed "appearance show" report generation up to AvatarFactoryModul... | Justin Clark-Casey (justincc) | 2011-12-19 | 7 | -56/+90 |
| |/ / |
|
* | | | Merge branch 'master' into careminster | Melanie | 2011-12-18 | 25 | -293/+302 |
|\ \ \
| |/ / |
|
| * | | Provide user feedback on execution of "backup" region console command | Justin Clark-Casey (justincc) | 2011-12-17 | 1 | -1/+2 |
| * | | Fix bug where objects couldn't be set back to the "none" group. | Justin Clark-Casey (justincc) | 2011-12-17 | 1 | -8/+13 |
| * | | Fix bug where objects could not be set to a new group if the group had been c... | Justin Clark-Casey (justincc) | 2011-12-17 | 8 | -21/+50 |
| * | | Add Garmin Kawaguichi to CONTRIBUTORS.txt | Justin Clark-Casey (justincc) | 2011-12-17 | 1 | -0/+1 |
| * | | If a startup simulator script is present, run it after the normal region sele... | Justin Clark-Casey (justincc) | 2011-12-17 | 1 | -12/+12 |
| * | | Add more documentation to EstateConnectorString in StandaloneCommon.ini.example | Justin Clark-Casey (justincc) | 2011-12-17 | 1 | -1/+4 |
| * | | refactor: simplify methods in Scene.PacketHandlers.cs by using GetGroupByPrim... | Justin Clark-Casey (justincc) | 2011-12-17 | 2 | -142/+81 |