aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-242-1/+14
|\
| * Implement llSetSoundQueueing().Justin Clark-Casey (justincc)2013-05-222-2/+16
* | Merge branch 'master' into careminsterMelanie2013-05-164-12/+11
|\ \ | |/
| * On closing child agents, send separate asynchronous requests to each neighbou...Justin Clark-Casey (justincc)2013-05-163-9/+5
| * On logout, send close child agent requests to neighbours asynchronously, so u...Justin Clark-Casey (justincc)2013-05-161-6/+3
| * Eliminate race condition where SimStatsReporter starts reportingRobert Adams2013-05-141-0/+3
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-141-0/+1
| |\
| | * Second take at HGTP-mesh bug: delay sending the initial data only for agents ...Diva Canto2013-05-141-0/+1
| * | Comment out some debugging item permission messages since these are highly no...Justin Clark-Casey (justincc)2013-05-141-3/+3
| |/
| * Revert "HGTP-mesh bug: the mesh download requests were going to the departing...Diva Canto2013-05-141-3/+0
| * HGTP-mesh bug: the mesh download requests were going to the departing sims fo...Diva Canto2013-05-141-0/+3
* | Merge branch 'master' into careminsterMelanie2013-05-121-29/+0
|\ \ | |/
| * Finalize the logic for SetHome. See comments in Land/LandManagementModule.cs ...Diva Canto2013-05-111-19/+0
* | Merge branch 'master' into careminsterMelanie2013-05-117-49/+112
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-05-117-47/+112
| |\
| | * Don't send BulkUpdateInventory at the end up of UpdateInventoryItemAsset().Justin Clark-Casey (justincc)2013-05-091-1/+4
| | * Only send one kill object to the deleter when they derez an object rather tha...Justin Clark-Casey (justincc)2013-05-092-17/+12
| | * remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-092-3/+4
| | * Fix issue where objects removed via llDie() would not disappear for users loo...Justin Clark-Casey (justincc)2013-05-094-19/+91
| | * minor: Simplify test setup in SceneObjectDeRezTests since permissions module ...Justin Clark-Casey (justincc)2013-05-091-10/+4
| * | Send up the part missing from the Avination Estate commit.Melanie2013-05-111-2/+0
| |/
* | Merge branch 'master' into careminsterMelanie2013-05-082-2/+2
|\ \ | |/
| * Step 2: commit the IEstateModuleInterface changes neededMelanie2013-05-071-1/+2
| * Step one of estate settings sharing - port the Avination Estate module (compl...Melanie2013-05-072-3/+4
* | 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-252-0/+123
|\ \ | |/
| * UUIDGatherer now includes UUIDs which reference texture assets used as materialsdahlia2013-04-241-0/+66
| * Adding the dynamic menu module which allows registering new menu options in c...Melanie2013-04-251-0/+57
| * 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
| * Fix bug where outstanding llHTTPRequests for scripts were not being aborted w...Justin Clark-Casey (justincc)2013-04-041-1/+7
* | 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