aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-285-62/+100
|\
| * Add back a log message when we attempt a megaregion auto-reteleportJustin Clark-Casey (justincc)2013-03-281-0/+4
| * minor: Only try to deregister stats in EntityTransferModule.RemoveRegion() if...Justin Clark-Casey (justincc)2013-03-281-4/+7
| * Fix a bug in HGEntityTransferModule to call base.RemoveRegion() when a region...Justin Clark-Casey (justincc)2013-03-281-1/+1
| * Instead of going via GodLikeRequestTeleport, auto-teleport the agent directly...Justin Clark-Casey (justincc)2013-03-282-4/+13
| * On the North and East sides of a megaregion, only consider regions within 256...Justin Clark-Casey (justincc)2013-03-281-2/+2
| * minor: Fix usage error message for "debug eq" console commandJustin Clark-Casey (justincc)2013-03-281-1/+1
| * Make HGLureModule track god like lures as well as normal lures, to see if thi...Justin Clark-Casey (justincc)2013-03-281-1/+2
| * Add "show eq" console command to show numbers of messages in agent event queues.Justin Clark-Casey (justincc)2013-03-281-0/+23
| * Remove some Console.WriteLines accidentally left in last commit cfb20f09Justin Clark-Casey (justincc)2013-03-281-2/+0
| * refactor: combine the checks for megaregion view range into a single place.Justin Clark-Casey (justincc)2013-03-281-51/+51
* | Merge branch 'master' into careminsterMelanie2013-03-281-1/+44
|\ \ | |/
| * Fix problem with megaregions where teleporting into a different region which ...Justin Clark-Casey (justincc)2013-03-281-1/+44
* | Merge branch 'master' into careminsterMelanie2013-03-272-52/+130
|\ \ | |/
| * Add admin_get_agents xmlrpc method.Justin Clark-Casey (justincc)2013-03-261-0/+66
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-261-52/+64
| |\
| | * BulletSim: prevent asset fetching loop when the fetched asset fails to mesh.Robert Adams2013-03-261-52/+64
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-2628-19/+71
| |\ \ | | |/
| * | Make llGetLinkPrimitiveParams() and llGetPrimitiveParams() work for avatars i...Justin Clark-Casey (justincc)2013-03-261-30/+194
* | | Merge branch 'master' into careminsterMelanie2013-03-261-0/+6
|\ \ \ | | |/ | |/|
| * | Implement a pref to turn on the simulator ExportSupported feature entry.Melanie2013-03-261-0/+6
| * | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-2627-19/+65
| |/
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-03-2627-23/+67
|\ \
| * | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-2426-20/+65
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-03-2325-156/+679
| |\ \
| * | | Fix SceneManager to use the new automatic property throughout.Melanie2013-03-211-3/+2
* | | | Merge branch 'master' into careminsterMelanie2013-03-266-42/+267
|\ \ \ \ | | |_|/ | |/| |
| * | | BulletSim: new algorithm for vertical attraction which uses quaternionRobert Adams2013-03-251-3/+45
| * | | BulletSim: small tweaks and formatting in the parameter fetching code.Robert Adams2013-03-251-5/+16
| * | | BulletSim: fix possible race condition where an prim's asset can be requested...Robert Adams2013-03-253-11/+24
| * | | BulletSim: parameterize C# HACD hull creation. Add feature of reducing max hu...Robert Adams2013-03-252-14/+74
| * | | Start recording inter-region teleport attempts, aborts, cancels and failures ...Justin Clark-Casey (justincc)2013-03-251-10/+109
* | | | Merge branch 'master' into careminsterMelanie2013-03-236-11/+60
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Fix teleporting into the non-SW 256x256 corner of a megaregion, though curren...Justin Clark-Casey (justincc)2013-03-231-0/+7
| * | Add "show borders" command to show the borders of a region.Justin Clark-Casey (justincc)2013-03-236-11/+54
| * | Following on from 476a7d3e (which wasn't enough), make chat across regions on...Justin Clark-Casey (justincc)2013-03-221-56/+31
* | | Merge branch 'avination' into careminsterMelanie2013-03-231-2/+15
|\ \ \
| * | | Make sharing errors not spew and let the cache retry the filesMelanie Thielker2013-03-231-1/+15
* | | | Merge branch 'master' into careminsterMelanie2013-03-222-10/+67
|\ \ \ \ | | |/ / | |/| |
| * | | Take out a testing sleep I accidentally left in the teleport code from last c...Justin Clark-Casey (justincc)2013-03-221-2/+0
| * | | At strategic points in the teleport process, if the client has simultaneously...Justin Clark-Casey (justincc)2013-03-222-10/+69
* | | | Merge branch 'master' into careminsterMelanie2013-03-2224-144/+597
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Implement chat across region borders since we can tell if avatars in neighbou...Justin Clark-Casey (justincc)2013-03-221-1/+1
| * | minor: On teleport, signal a child agent before we send the viewer TeleportFi...Justin Clark-Casey (justincc)2013-03-211-5/+5
| * | On a teleport, lock m_agentsInTransit whilst we grab the value to check for c...Justin Clark-Casey (justincc)2013-03-212-5/+12
| * | minor: disable logging on regression TestCrossOnSameSimulator() that I accide...Justin Clark-Casey (justincc)2013-03-201-1/+1
| * | minor: don't bother with the pause before rezzing attachments if we are runni...Justin Clark-Casey (justincc)2013-03-201-1/+15
| * | Add file missing from last commit 36651beJustin Clark-Casey (justincc)2013-03-201-0/+91
| * | On the later forms of teleport failure, tell the user if this was because vie...Justin Clark-Casey (justincc)2013-03-206-71/+185
| * | Insert a short delay on the simulator side rezzing of attachments in order to...Justin Clark-Casey (justincc)2013-03-201-1/+1