aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-031-1/+1
|\
| * Revert "fix CopyTo call that was breaking under mono 2.10"Melanie2011-11-031-1/+1
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-0216-114/+121
|\ \
| * \ Merge branch 'master' into bigmergeMelanie2011-11-031-1/+1
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2011-11-024-23/+37
| | |\
| | * | fix CopyTo call that was breaking under mono 2.10Mic Bowman2011-11-021-1/+1
| * | | Merge branch 'master' into bigmergeMelanie2011-11-0315-113/+120
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-0215-107/+117
| | |\ \ | | | |/
| | | * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-026-330/+402
| | | |\
| | | | * Get some hopefully more useful exception information when OpenJPEG.EncodeFrom...Justin Clark-Casey (justincc)2011-11-022-5/+8
| | | | * Fix race condition that would sometimes send or save appearance for the wrong...Justin Clark-Casey (justincc)2011-11-022-9/+24
| | | | * Catch any exceptions exiting the top of the robust console, as we already do ...Justin Clark-Casey (justincc)2011-11-021-1/+8
| | | * | Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.Dan Lake2011-11-0211-92/+77
| * | | | Merge branch 'master' into bigmergeMelanie2011-11-020-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Port the Avination offline messaging system to CoreMelanie2011-11-024-23/+37
| | | |/ | | |/|
* | | | Fix link order when linking sets to setsMelanie2011-11-022-40/+18
|/ / /
* | | Merge branch 'master' into bigmergeMelanie2011-11-021-322/+350
|\ \ \ | |/ /
| * | Restore the recursive calling of PRIM_LINK_TARGET because the version I madeMelanie2011-11-021-327/+334
| * | Some positioning fixes from AVN trunkMelanie2011-11-021-1/+42
* | | Merge branch 'master' into bigmergeMelanie2011-11-022-6/+1
|\ \ \ | |/ /
| * | Streamline PRIM_LINK_TARGET, eliminating a recursion and a failure scenarioMelanie2011-11-021-4/+3
| |/
| * Removed redundant SceneContents property from Scene. It's the same as SceneGr...Dan Lake2011-11-012-6/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-021-10/+7
|\ \ | |/
| * Part 2 of see_into_this_sim_from_neighbor configuration option removalDan Lake2011-11-011-10/+7
* | Merge branch 'master' into bigmergeMelanie2011-11-0119-817/+255
|\ \ | |/
| * Removed see_into_this_sim_from_neighbor configuration option.Dan Lake2011-11-013-14/+1
| * Add "appearance send" command to allow manual sending of appearance.Justin Clark-Casey (justincc)2011-11-013-6/+23
| * Add "show status" command to pCambotJustin Clark-Casey (justincc)2011-11-012-22/+45
| * Listen only for non SimShutdown Network.Disconnect firing so that we don't qu...Justin Clark-Casey (justincc)2011-11-011-1/+7
| * get rid of unused m_verbose fieldJustin Clark-Casey (justincc)2011-11-011-1/+0
| * stop recording the threads on which we happen to start bots. These are point...Justin Clark-Casey (justincc)2011-11-011-7/+5
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-013-48/+13
| |\
| | * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-10-318-623/+58
| | |\
| | * | Removed unused show commands from Scene.cs and SceneBase.cs. The show modules...Dan Lake2011-10-313-48/+13
| * | | Retain a reference to an action thread rather than starting an infinite loop ...Justin Clark-Casey (justincc)2011-11-011-8/+20
| | |/ | |/|
| * | Make bots share a cache so that asset downloads attempts are only made once i...Justin Clark-Casey (justincc)2011-10-312-20/+24
| * | Remove OpenSim.TestSuiteJustin Clark-Casey (justincc)2011-10-318-600/+9
| * | Stop individual bots attempting to download the same asset more than onceJustin Clark-Casey (justincc)2011-10-311-14/+36
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-311-1/+1
| |\ \ | | |/
| | * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-10-315-102/+98
| | |\
| | * | Adding green dots to map response should be for root agents onlyDan Lake2011-10-311-1/+1
| * | | Fix bot disconnectionJustin Clark-Casey (justincc)2011-10-311-1/+1
| | |/ | |/|
| * | adjust pCampbot so it starts up bots with the name format "<firstname> <lastn...Justin Clark-Casey (justincc)2011-10-314-94/+89
| * | Remove unused PumaCode.SvnDotNet libraryJustin Clark-Casey (justincc)2011-10-311-0/+0
| * | Stop pCampbot from firing connected event twice, which results in double coun...Justin Clark-Casey (justincc)2011-10-312-10/+11
| |/
| * Plug a security hole in the inventory serviceMelanie2011-10-311-1/+2
* | Merge branch 'master' into bigmergeMelanie2011-10-311-27/+25
|\ \ | |/
| * Fix line endingsDan Lake2011-10-301-23/+23
| * Experimental reorder of Heartbeat loop now simulates physics and sends update...Dan Lake2011-10-301-29/+27
* | Plug a security hole in the inventory serviceMelanie2011-10-311-1/+2