aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-061-5/+18
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-062-9/+106
| |\
| * | Minor reordering of operations on NewUserConnection. The agent circuit needs ...Diva Canto2013-05-061-5/+17
* | | Merge branch 'master' into careminsterMelanie2013-05-042-2/+18
|\ \ \ | | |/ | |/|
| * | On startup, start scenes after we're set up all local scenes, rather than sta...Justin Clark-Casey (justincc)2013-05-032-2/+18
| * | Some more pieces of Avination's ban system - if an avatar isn't allowed on anyMelanie2013-04-291-7/+88
| |/
* | Merge branch 'master' into careminsterMelanie2013-04-251-0/+66
|\ \ | |/
| * UUIDGatherer now includes UUIDs which reference texture assets used as materialsdahlia2013-04-241-0/+66
| * Add Avination's support for parcel eject and freezeMelanie2013-04-251-15/+25
* | Merge branch 'master' into careminsterMelanie2013-04-211-9/+35
|\ \ | |/
| * Materials-capable viewers send ImageUpdate packets when updating materials th...dahlia2013-04-191-11/+35
| * Allow changes to TextureEntry to propagate to viewers when MaterialID changesdahlia2013-04-171-0/+2
* | Merge branch 'master' into careminsterMelanie2013-04-101-6/+6
|\ \ | |/
| * Fix taking (and rezzing) of coalesced objects in the non-root subregions of m...Justin Clark-Casey (justincc)2013-04-061-6/+6
* | Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminsterMelanie2013-04-041-11/+2
|\ \ | |/
| * Fix minor race condition in SOP.SitTargetOrientationLL where inconsistent val...Justin Clark-Casey (justincc)2013-04-031-11/+2
* | Merge branch 'master' into careminsterMelanie2013-04-021-5/+6
|\ \ | |/
| * Use consistent GroupPosition value Make SOP.UpdateGroupPosition() rather than...Justin Clark-Casey (justincc)2013-04-031-5/+6
* | Merge branch 'master' into careminsterMelanie2013-04-021-1/+1
|\ \ | |/
| * fix minor race condition in SOP.SitTargetPositionLL where inconsistency could...Justin Clark-Casey (justincc)2013-04-031-1/+1
* | Merge branch 'master' into careminsterMelanie2013-04-021-7/+7
|\ \ | |/
| * minor: Make SOP.UpdateOffset() more consistent by checking against the same o...Justin Clark-Casey (justincc)2013-04-031-7/+7
| * Fix minor race condition where SOP.GetGeometricCenter() and GetCenterOfMass()...Justin Clark-Casey (justincc)2013-04-021-4/+4
| * Export permission, part two. Setting export perms for textures and clothing w...Melanie2013-03-313-10/+74
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-03-314-79/+95
|\ \
| * \ Merge branch 'master' into careminsterMelanie2013-03-291-5/+2
| |\ \ | | |/
| | * Check viewer 2/3 attachment calls against avatar appearance attachment data r...Justin Clark-Casey (justincc)2013-03-291-5/+2
| * | Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminsterMelanie2013-03-293-1/+33
| |\ \ | | |/
| | * Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for scrip...Justin Clark-Casey (justincc)2013-03-293-1/+30
| * | 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 '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-291-7/+5
| |\ \ | | |/
| | * If the viewer has already rezzed any attachments itself, then ignore the simu...Justin Clark-Casey (justincc)2013-03-281-7/+5
| * | 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 commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminsterMelanie2013-03-292-44/+38
| |\ \ | | |/
| | * Move the simulator-side RezAttachments call on login to SP.MakeRootAgent with...Justin Clark-Casey (justincc)2013-03-282-38/+31
| | * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-266-3/+9
| * | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-03-267-6/+11
| |\ \
| * \ \ Merge branch 'master' into careminsterMelanie2013-03-233-6/+22
| |\ \ \ | | | |/ | | |/|
| | * | 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-233-6/+16
* | | | Export permission, part two. Setting export perms for textures and clothing w...Melanie2013-03-313-11/+66
| |_|/ |/| |
* | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-246-3/+9
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-03-234-23/+144
|\ \ \ | |/ /
| * | Merge branch 'master' into careminsterMelanie2013-03-224-23/+144
| |\ \ | | |/
| | * On a teleport, lock m_agentsInTransit whilst we grab the value to check for c...Justin Clark-Casey (justincc)2013-03-211-4/+4
| | * minor: disable logging on regression TestCrossOnSameSimulator() that I accide...Justin Clark-Casey (justincc)2013-03-201-1/+1
generated by cgit v1.1 at 2024-12-23 18:10:19 +0000