aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-04-213-28/+58
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-04-213-28/+58
| |\
| | * minor: small amount of method doc and some commented out odds and endsJustin Clark-Casey (justincc)2011-04-211-6/+15
| | * Alter uuid gather so that it properly analyzes coalesced objects.Justin Clark-Casey (justincc)2011-04-212-22/+43
| * | Implement agent limitsMelanie2011-04-212-0/+25
| |/
* | Add fix a minor bugMelanie2011-04-211-1/+1
* | Honor agent limit for region crossings and teleportsMelanie2011-04-211-0/+11
* | Merge branch 'queuetest' into careminster-presence-refactorMelanie2011-04-211-2/+2
|\ \
| * | Added an "immediate" queue to the priority queue. This isMic Bowman2011-04-201-2/+2
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-212-2/+19
|\ \ | |/
| * refactor: rename DeleteToInventory() to CopyToInventory()Justin Clark-Casey (justincc)2011-04-182-2/+19
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-182-13/+7
|\ \ | |/
| * Merge branch 'master' into test-merge0418Mic Bowman2011-04-185-18/+62
| |\
| * \ Merge branch 'master' into queuetestMic Bowman2011-04-141-1/+5
| |\ \
| * | | First pass at moving object property requests into a queue similarMic Bowman2011-04-132-13/+7
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-1711-30/+426
|\ \ \ \ | | |_|/ | |/| |
| * | | get rid of all traces of the now used mock service infrastructureJustin Clark-Casey (justincc)2011-04-152-4/+4
| * | | remove mock asset service for tests in favour of always using the real oneJustin Clark-Casey (justincc)2011-04-151-1/+3
| * | | Make all the objects in a coalescence reappears after being loaded from an IA...Justin Clark-Casey (justincc)2011-04-151-6/+41
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-04-141-1/+5
| |\ \ \ | | | |/ | | |/|
| | * | Comment out the warning if the prioritizer runs without a fullyMic Bowman2011-04-131-1/+5
| | |/
| * | simplify coalesced object tests by using existing scene object set up utilsJustin Clark-Casey (justincc)2011-04-141-7/+14
| |/
| * Adjust the quanterions used in the rez coalsced object tests to get sensible ...Justin Clark-Casey (justincc)2011-04-132-1/+12
| * refactor: move code to obtain the coalescence size and object offsets into Co...Justin Clark-Casey (justincc)2011-04-132-15/+38
| * Add coalesced scene objects class and serializer. This is currently only use...Justin Clark-Casey (justincc)2011-04-135-4/+281
| * Bug fix in object serialization -- sculpt data was wrong.Diva Canto2011-04-121-1/+1
| * refactor: simplify bRayEndIsIntersection boolean set from RayEndIsIntersectio...Justin Clark-Casey (justincc)2011-04-121-12/+1
| * If an object is rezzed directly from a prim inventory then give it the rotati...Justin Clark-Casey (justincc)2011-04-121-1/+1
| * Allow a null rotation to be passed in to RezObject so that we can control whe...Justin Clark-Casey (justincc)2011-04-121-7/+13
| * Fix (add) ability to rez objects by dragging them out of another prim's inven...Justin Clark-Casey (justincc)2011-04-121-5/+54
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-122-160/+107
|\ \ | |/
| * Make it more obvious when it happens that DLL plugin loading fails. Improve ...Justin Clark-Casey (justincc)2011-04-111-1/+2
| * Changed the "not in scene" check in the prioritizier to justMic Bowman2011-04-101-2/+3
| * Fixed the prioritizer functions for the new priority queuesMic Bowman2011-04-101-210/+82
| * Implements adaptive queue management and fair queueing forMic Bowman2011-04-101-2/+69
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-082-1/+3
|\ \ | |/
| * Fix bug where on duplication, the root part local id was continually used in ...Justin Clark-Casey (justincc)2011-04-061-1/+1
| * Signal prim count taint if the AbsolutePosition of a scene object changes.Justin Clark-Casey (justincc)2011-04-061-0/+2
* | Add support for the new display name related functions in LSL. This does notMelanie2011-04-081-6/+6
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-064-17/+20
|\ \ | |/
| * Change some text to make the autoreturn mechanism more obvious, and align wit...Justin Clark-Casey (justincc)2011-04-052-3/+8
| * remove now unused individual LandData prim counts.Justin Clark-Casey (justincc)2011-04-051-14/+0
| * Make the "All Estates" option work from the client (this makes chosen changes...Justin Clark-Casey (justincc)2011-04-052-0/+12
| * Implement taking of coalesced objects.Melanie2011-04-032-2/+11
| * Make CHANGED_OWNER work for deeding and god-mode in-world changeMelanie2011-04-031-0/+4
| * A stab at making CHANGED_OWNER workMelanie2011-04-011-5/+5
| * Remove unused Datastore parameter from RegionInfo (legacy from early 2008)Justin Clark-Casey (justincc)2011-03-312-3/+0
* | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2011-04-031-0/+4
|\ \
| * | Make CHANGED_OWNER work for deeding and god-mode in-world changeMelanie2011-04-031-0/+4
* | | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2011-04-011-5/+5
|\ \ \ | |/ /