| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-03 | 1 | -1/+1 |
|\ \ \
| | |/
| |/| |
|
| * | | Revert "fix CopyTo call that was breaking under mono 2.10" | Melanie | 2011-11-03 | 1 | -1/+1 |
* | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-11-02 | 16 | -114/+121 |
|\ \ \ |
|
| * \ \ | Merge branch 'master' into bigmerge | Melanie | 2011-11-03 | 1 | -1/+1 |
| |\ \ \
| | |/ / |
|
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2011-11-02 | 4 | -23/+37 |
| | |\ \ |
|
| | * | | | fix CopyTo call that was breaking under mono 2.10 | Mic Bowman | 2011-11-02 | 1 | -1/+1 |
| * | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-03 | 15 | -113/+120 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-11-02 | 15 | -107/+117 |
| | |\ \ \
| | | |/ / |
|
| | | * | | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-11-02 | 6 | -330/+402 |
| | | |\ \
| | | | |/ |
|
| | | | * | Get some hopefully more useful exception information when OpenJPEG.EncodeFrom... | Justin Clark-Casey (justincc) | 2011-11-02 | 2 | -5/+8 |
| | | | * | Fix race condition that would sometimes send or save appearance for the wrong... | Justin Clark-Casey (justincc) | 2011-11-02 | 2 | -9/+24 |
| | | | * | Catch any exceptions exiting the top of the robust console, as we already do ... | Justin Clark-Casey (justincc) | 2011-11-02 | 1 | -1/+8 |
| | | * | | Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL. | Dan Lake | 2011-11-02 | 11 | -92/+77 |
| * | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-02 | 0 | -0/+0 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | Port the Avination offline messaging system to Core | Melanie | 2011-11-02 | 4 | -23/+37 |
| | | |/
| | |/| |
|
* | | | | Fix link order when linking sets to sets | Melanie | 2011-11-02 | 2 | -40/+18 |
|/ / / |
|
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-02 | 1 | -322/+350 |
|\ \ \
| |/ / |
|
| * | | Restore the recursive calling of PRIM_LINK_TARGET because the version I made | Melanie | 2011-11-02 | 1 | -327/+334 |
| * | | Some positioning fixes from AVN trunk | Melanie | 2011-11-02 | 1 | -1/+42 |
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-02 | 2 | -6/+1 |
|\ \ \
| |/ / |
|
| * | | Streamline PRIM_LINK_TARGET, eliminating a recursion and a failure scenario | Melanie | 2011-11-02 | 1 | -4/+3 |
| |/ |
|
| * | Removed redundant SceneContents property from Scene. It's the same as SceneGr... | Dan Lake | 2011-11-01 | 2 | -6/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-02 | 1 | -10/+7 |
|\ \
| |/ |
|
| * | Part 2 of see_into_this_sim_from_neighbor configuration option removal | Dan Lake | 2011-11-01 | 1 | -10/+7 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-01 | 19 | -817/+255 |
|\ \
| |/ |
|
| * | Removed see_into_this_sim_from_neighbor configuration option. | Dan Lake | 2011-11-01 | 3 | -14/+1 |
| * | Add "appearance send" command to allow manual sending of appearance. | Justin Clark-Casey (justincc) | 2011-11-01 | 3 | -6/+23 |
| * | Add "show status" command to pCambot | Justin Clark-Casey (justincc) | 2011-11-01 | 2 | -22/+45 |
| * | Listen only for non SimShutdown Network.Disconnect firing so that we don't qu... | Justin Clark-Casey (justincc) | 2011-11-01 | 1 | -1/+7 |
| * | get rid of unused m_verbose field | Justin Clark-Casey (justincc) | 2011-11-01 | 1 | -1/+0 |
| * | stop recording the threads on which we happen to start bots. These are point... | Justin Clark-Casey (justincc) | 2011-11-01 | 1 | -7/+5 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-11-01 | 3 | -48/+13 |
| |\ |
|
| | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-10-31 | 8 | -623/+58 |
| | |\ |
|
| | * | | Removed unused show commands from Scene.cs and SceneBase.cs. The show modules... | Dan Lake | 2011-10-31 | 3 | -48/+13 |
| * | | | Retain a reference to an action thread rather than starting an infinite loop ... | Justin Clark-Casey (justincc) | 2011-11-01 | 1 | -8/+20 |
| | |/
| |/| |
|
| * | | Make bots share a cache so that asset downloads attempts are only made once i... | Justin Clark-Casey (justincc) | 2011-10-31 | 2 | -20/+24 |
| * | | Remove OpenSim.TestSuite | Justin Clark-Casey (justincc) | 2011-10-31 | 8 | -600/+9 |
| * | | Stop individual bots attempting to download the same asset more than once | Justin Clark-Casey (justincc) | 2011-10-31 | 1 | -14/+36 |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-31 | 1 | -1/+1 |
| |\ \
| | |/ |
|
| | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-10-31 | 5 | -102/+98 |
| | |\ |
|
| | * | | Adding green dots to map response should be for root agents only | Dan Lake | 2011-10-31 | 1 | -1/+1 |
| * | | | Fix bot disconnection | Justin Clark-Casey (justincc) | 2011-10-31 | 1 | -1/+1 |
| | |/
| |/| |
|
| * | | adjust pCampbot so it starts up bots with the name format "<firstname> <lastn... | Justin Clark-Casey (justincc) | 2011-10-31 | 4 | -94/+89 |
| * | | Remove unused PumaCode.SvnDotNet library | Justin Clark-Casey (justincc) | 2011-10-31 | 1 | -0/+0 |
| * | | Stop pCampbot from firing connected event twice, which results in double coun... | Justin Clark-Casey (justincc) | 2011-10-31 | 2 | -10/+11 |
| |/ |
|
| * | Plug a security hole in the inventory service | Melanie | 2011-10-31 | 1 | -1/+2 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-31 | 1 | -27/+25 |
|\ \
| |/ |
|
| * | Fix line endings | Dan Lake | 2011-10-30 | 1 | -23/+23 |
| * | Experimental reorder of Heartbeat loop now simulates physics and sends update... | Dan Lake | 2011-10-30 | 1 | -29/+27 |
* | | Plug a security hole in the inventory service | Melanie | 2011-10-31 | 1 | -1/+2 |