| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master' into bigmerge | Melanie | 2011-11-12 | 1 | -2/+3 |
| |\ |
|
| | * | doh - correct build break | Justin Clark-Casey (justincc) | 2011-11-12 | 1 | -6/+7 |
| | * | Add threads to the watchdog thread list before we start them. | Justin Clark-Casey (justincc) | 2011-11-12 | 1 | -5/+5 |
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -8/+6 |
| |\ \
| |/ |
|
| | * | Remove unused avariable in PollServiceRequestManager | Justin Clark-Casey (justincc) | 2011-11-07 | 1 | -8/+6 |
| | * | Convert SendKillObject to take a list of uint rather than sending one | Melanie | 2011-11-06 | 1 | -1/+1 |
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-05 | 1 | -24/+12 |
| |\ \
| |/ |
|
| | * | Fix avatar height, removes the hip offset hack | nebadon | 2011-11-05 | 1 | -24/+12 |
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -8/+0 |
| |\ \
| |/ |
|
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 15 | -80/+330 |
| |\ \
| |/ |
|
| | * | Restart the event queue worker threads that I accidentally disabled earlier t... | Justin Clark-Casey (justincc) | 2011-10-25 | 2 | -9/+11 |
| | * | In Watchdog, add ability to specific timeout for a thread. | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -16/+56 |
| | * | Add m_threads dictionary locking to Watchdog.GetThreads() | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -1/+2 |
| | * | minor: add "threads show" as synonym for "show threads" for consistency | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+5 |
| | * | Add "threads abort <thread-id>" simulator console command that allows us to a... | Justin Clark-Casey (justincc) | 2011-10-25 | 2 | -2/+48 |
| | * | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o... | Justin Clark-Casey (justincc) | 2011-10-25 | 13 | -64/+212 |
| * | | Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge | Melanie | 2011-10-25 | 1 | -12/+2 |
| |\ \
| |/ |
|
| | * | Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer() | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -12/+2 |
| * | | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge | Melanie | 2011-10-25 | 2 | -5/+9 |
| |\ \
| |/ |
|
| | * | Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollS... | Justin Clark-Casey (justincc) | 2011-10-24 | 2 | -5/+9 |
| * | | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge | Melanie | 2011-10-25 | 2 | -5/+6 |
| |\ \
| |/ |
|
| | * | Get UUIDGatherer to scan notecards in the graph for asset uuids. | Justin Clark-Casey (justincc) | 2011-10-22 | 2 | -5/+6 |
| * | | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
| |\ \
| |/ |
|
| | * | refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter w... | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -2/+2 |
| * | | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+0 |
| |\ \
| |/ |
|
| | * | move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with t... | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -5/+0 |
| * | | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+2 |
| |\ \
| |/ |
|
| | * | fetch physical_prim switch from [Startup] config from inside scene, as is don... | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -5/+2 |
| * | | Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+6 |
| |\ \
| |/ |
|
| | * | Restore [Startup] physical_prim flag which can stop any prims being subject t... | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -0/+6 |
| * | | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+8 |
| |\ \
| |/ |
|
| | * | refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it s... | Justin Clark-Casey (justincc) | 2011-10-14 | 1 | -1/+8 |
| * | | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge | Melanie | 2011-10-25 | 2 | -38/+0 |
| |\ \
| |/ |
|
| | * | Get rid of some traces of the old pre-ROBUST grid architecture config | Justin Clark-Casey (justincc) | 2011-10-12 | 2 | -38/+0 |
| * | | Adjust CM version tag | Melanie | 2011-10-12 | 1 | -1/+1 |
| * | | Merge commit 'f8c06c61149b1ab3e3002247280be250b558a79e' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
| |\ \
| |/ |
|
| | * | flip master version up to 0.7.3 | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-03 | 1 | -2/+1 |
| | |\ |
|
| * | \ | Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge | Melanie | 2011-10-11 | 1 | -3/+0 |
| |\ \ \
| |/ / |
|
| | * | | Remove vestigal RegionStatus.SlaveScene. | Justin Clark-Casey (justincc) | 2011-10-03 | 1 | -3/+0 |
| * | | | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+1 |
| |\ \ \
| | |/
| |/| |
|
| | * | | Remove usage of Linden packet types from inside Attachments Module and interface | Dan Lake | 2011-10-03 | 1 | -2/+1 |
| | |/ |
|
| * | | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
| |\ \
| |/ |
|
| | * | Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to all... | Justin Clark-Casey (justincc) | 2011-09-30 | 1 | -1/+1 |
| * | | Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge | Melanie | 2011-10-11 | 2 | -35/+62 |
| |\ \
| |/ |
|
| | * | Added a setting to [Startup] section of config that will allow the simulator ... | Kevin Houlihan & Michelle Argus | 2011-09-24 | 2 | -21/+51 |
| * | | Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge | Melanie | 2011-10-11 | 2 | -0/+3 |
| |\ \
| |/ |
|
| | * | Fix avatar parameter updating for viewer 3 and maybe 2. | Justin Clark-Casey (justincc) | 2011-09-23 | 2 | -0/+3 |
| * | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
| |\ \
| |/ |
|
| | * | Reinstate option to land an npc when it reaches a target. | Justin Clark-Casey (justincc) | 2011-09-22 | 1 | -1/+1 |
