aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | | | | | | | per Melanie's very good suggestion. The immediate queue is serviced completely before all others, making it a very good place to put avatar updates & attachments. Moved the priority queue out of the LLUDP directory and into the framework. It is now a fairly general utility.
* | 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
| | | | | | | | DeleteToInventory() is misleading - it is the caller that decides whether to delete or not
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the entity update queue. The number of property packets can become significant when selecting/deselecting large numbers of objects. This is experimental code.
* | | | 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 ↵Justin Clark-Casey (justincc)2011-04-151-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing. From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object. However, root part uuids may well still be missing, and there may be other odd artifacts from this bug. It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups.
| * | | 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
| | |/ | | | | | | | | | | | | initialized scene presence. Not sure why we are dumping updates to a client that isn't there yet...
| * | simplify coalesced object tests by using existing scene object set up utilsJustin Clark-Casey (justincc)2011-04-141-7/+14
| |/ | | | | | | this change makes it possible to set an absolute position on a group before it is put into a scene.
| * Adjust the quanterions used in the rez coalsced object tests to get sensible ↵Justin Clark-Casey (justincc)2011-04-132-1/+12
| | | | | | | | | | | | bounding box and offset numbers. Extend test to check position of objects in the rezzed coalescence.
| * refactor: move code to obtain the coalescence size and object offsets into ↵Justin Clark-Casey (justincc)2011-04-132-15/+38
| | | | | | | | CoalescedSceneObjects from the serializer.
| * Add coalesced scene objects class and serializer. This is currently only ↵Justin Clark-Casey (justincc)2011-04-135-4/+281
| | | | | | | | | | | | | | | | | | used by the TestRezCoalescedObject() regression test. This structure matches the existing one for SceneObjects and will allow code to be reused by the uuid gatherer, other tests, etc. Test is not yet fully implemented due to a bug in rezzing coalesced objects where they all get the same name as the item. Only one object should get the same name as the item, which appears to be the one selected last when the the objects were coalesced in the first place. This bug will be addressed shortly.
| * Bug fix in object serialization -- sculpt data was wrong.Diva Canto2011-04-121-1/+1
| |
| * refactor: simplify bRayEndIsIntersection boolean set from ↵Justin Clark-Casey (justincc)2011-04-121-12/+1
| | | | | | | | RayEndIsIntersection byte
| * If an object is rezzed directly from a prim inventory then give it the ↵Justin Clark-Casey (justincc)2011-04-121-1/+1
| | | | | | | | rotation it was stored with.
| * Allow a null rotation to be passed in to RezObject so that we can control ↵Justin Clark-Casey (justincc)2011-04-121-7/+13
| | | | | | | | whether to use the serialized rotation or not. Not used yet.
| * Fix (add) ability to rez objects by dragging them out of another prim's ↵Justin Clark-Casey (justincc)2011-04-121-5/+54
| | | | | | | | | | | | | | | | inventory. This should happen if the client supplies a task ID with the RezObject call. The rez goes through the same code as llRezObject(), so the same perms are applied. Rotation isn't yet preserved, this should be fixed shortly.
* | 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
| | | | | | | | exception output on Windows.
| * Changed the "not in scene" check in the prioritizier to justMic Bowman2011-04-101-2/+3
| | | | | | | | | | | | a warning. There appears to be a race condition on slow logins that attempts to prioritize before the scene presence is fully initialized.
| * 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
| | | | | | | | | | | | | | improved networking performance. Reprioritization algorithms need to be ported still. One is in place.
* | 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
| | | | | | | | populating the local id scene object index instead of each part's local id
| * Signal prim count taint if the AbsolutePosition of a scene object changes.Justin Clark-Casey (justincc)2011-04-061-0/+2
| | | | | | | | | | This updates prim counts correctly if an object is moved by something other than an avatar (e.g. scripts, region modules) Create TestMoveOwnerObject() regression test for this case.
* | Add support for the new display name related functions in LSL. This does notMelanie2011-04-081-6/+6
| | | | | | | | | | | | implement the display names functionality as such, but it allows scripts that are display name aware to function as if the display name were implemented and set to the avatar name.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-064-17/+20
|\ \ | |/
| * Change some text to make the autoreturn mechanism more obvious, and align ↵Justin Clark-Casey (justincc)2011-04-052-3/+8
| | | | | | | | with the fact that it's one word rather than two.
| * remove now unused individual LandData prim counts.Justin Clark-Casey (justincc)2011-04-051-14/+0
| | | | | | | | | | However, the calls to the land management module to record prims need to remain, since they were also being used to return owner object lists, etc. This is probably why prim counts were being done there in the first place.
| * Make the "All Estates" option work from the client (this makes chosen ↵Justin Clark-Casey (justincc)2011-04-052-0/+12
| | | | | | | | | | | | | | | | changes to all the estates that the user owns). This applies to adding/removing estate users, groups, managers and bans. This is the application of the AllEstates_0.5.patch from http://opensimulator.org/mantis/view.php?id=5420 Thanks very much, Snoopy!
| * Implement taking of coalesced objects.Melanie2011-04-032-2/+11
| | | | | | | | | | | | | | WARNING!!!!! You can TAKE them, but you can't REZ them again. Only the first of the contained objects will rez, the rest is inaccessible until rezzing them is implemented. Also, rotations are not explicitly stored. This MAY work. Or not.
| * 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 ↵Melanie2011-04-031-0/+4
|\ \ | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Make CHANGED_OWNER work for deeding and god-mode in-world changeMelanie2011-04-031-0/+4
| | |
* | | Merge branch 'careminster-presence-refactor' of ↵Melanie2011-04-011-5/+5
|\ \ \ | |/ / | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | A stab at making CHANGED_OWNER workMelanie2011-04-011-5/+5
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-013-223/+1
|\ \ \ | |/ / |/| / | |/
| * When an object is duplicated, add the dupe to the uuid/local id indexes as ↵Justin Clark-Casey (justincc)2011-03-261-1/+29
| | | | | | | | | | | | | | | | | | well as the basic entities list. Added a prim counts test to reinforce this - shift-copy was no incrementing prim count. This will sometime become a basic scene test. New code needs to be refactored so we just call SceneGraph.AddSceneObject(). This will happen in the near future. With this, basic owner prim counts on a single parcel appear to be working fine (with the same previous existing taint calls as used by the land management module). More work to do.
| * Merge branch 'master' into primcountsJustin Clark-Casey (justincc)2011-03-261-28/+48
| |\
| * | Start using IPrimCounts populated by PrimCountModule instead of LandData ↵Justin Clark-Casey (justincc)2011-03-253-223/+1
| | | | | | | | | | | | | | | | | | | | | counts populated by LandManagementModule. In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci Counts are showing odd behaviour at the moment, this will be addressed shortly.
* | | Flag root prim changes for persistenceTom2011-03-271-1/+1
| | |