aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-291-21/+0
|\
| * Eliminate code which tries to restart attachment scripts in ScenePresence.Mak...Justin Clark-Casey (justincc)2013-03-291-18/+0
* | Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminsterMelanie2013-03-294-24/+23
|\ \ | |/
| * Stop attempts to update/add existing attachments in user inventory when telep...Justin Clark-Casey (justincc)2013-03-284-24/+25
* | Merge commit '2b142f2f9e888d5cb7317cc51c12ac7152c54459' into careminsterMelanie2013-03-291-54/+145
|\ \ | |/
| * Add "debug attachments" console command to allow highly verbose attachment lo...Justin Clark-Casey (justincc)2013-03-281-61/+109
* | Merge commit 'feffc8081dc5ab2889a7ea4b96b2befaed0c3f95' into careminsterMelanie2013-03-291-5/+0
|\ \ | |/
| * minor: remove some mono compiler warnings from EntityTransferModuleJustin Clark-Casey (justincc)2013-03-281-5/+0
* | Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminsterMelanie2013-03-291-27/+27
|\ \ | |/
| * minor: comment out unused Scene.AgentCrossing() to reduce code complexityJustin Clark-Casey (justincc)2013-03-281-27/+27
* | Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminsterMelanie2013-03-293-11/+19
|\ \ | |/
| * If the viewer has already rezzed any attachments itself, then ignore the simu...Justin Clark-Casey (justincc)2013-03-283-11/+19
* | Merge commit '3b377f16b29a6395d73af1cc987cb9abf9935376' into careminsterMelanie2013-03-291-2/+2
|\ \ | |/
| * Fix regression tests by making a new NPC always trigger simulator side attach...Justin Clark-Casey (justincc)2013-03-281-2/+2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-285-43/+64
| |\
* | \ Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminsterMelanie2013-03-293-45/+39
|\ \ \ | |/ /
| * | Move the simulator-side RezAttachments call on login to SP.MakeRootAgent with...Justin Clark-Casey (justincc)2013-03-283-39/+32
* | | Merge commit '6a9630d2bdc27ed702936f4c44e6978f728a9ef0' into careminsterMelanie2013-03-295-43/+64
|\ \ \ | | |/ | |/|
| * | BulletSim: fix race condition when creating very large mega-regions.Robert Adams2013-03-285-22/+35
| * | BulletSim: tweaks to terrain boundry computation. No functional changes.Robert Adams2013-03-281-21/+29
| |/
* | 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-271-52/+64
|\ \ | |/
| * 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-2622-16/+46
| |\ \ | | |/
| * | 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-2621-16/+40
| |/
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-03-2621-20/+42
|\ \
| * | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-2420-17/+40
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-03-2320-94/+502
| |\ \
| * | | 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