Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bump default IAR version to 0.2 and 1.1 for the --profile version. | Justin Clark-Casey (justincc) | 2011-04-18 | 1 | -2/+2 |
| | | | | There are no changes in this bump, they just signal a point at which the control file comes first in the archive. | ||||
* | bump oar version number to 0.6. | Justin Clark-Casey (justincc) | 2011-04-18 | 1 | -1/+1 |
| | | | | This commit contains no data changes - the version bump is to establish a version at which the control file must come first in the archive. | ||||
* | Add regression test to check that OARs start with the control file. | Justin Clark-Casey (justincc) | 2011-04-18 | 3 | -9/+21 |
| | |||||
* | add test to ensure that an IAR starts with the control file | Justin Clark-Casey (justincc) | 2011-04-18 | 2 | -11/+39 |
| | |||||
* | refactor: split out the code which actually copies a particular bundle to ↵ | Justin Clark-Casey (justincc) | 2011-04-18 | 1 | -106/+115 |
| | | | | inventory | ||||
* | refactor: rename DeleteToInventory() to CopyToInventory() | Justin Clark-Casey (justincc) | 2011-04-18 | 1 | -1/+1 |
| | | | | DeleteToInventory() is misleading - it is the caller that decides whether to delete or not | ||||
* | Fix bug where objects were being coalesced in the wrong positions. | Justin Clark-Casey (justincc) | 2011-04-18 | 1 | -2/+2 |
| | | | | | This addresses http://opensimulator.org/mantis/view.php?id=5441 The bug was due to a pre-existing mistake in creating the inventory stored position | ||||
* | Provide a configuration setting to control whether multiple taken objects ↵ | Justin Clark-Casey (justincc) | 2011-04-18 | 2 | -15/+47 |
| | | | | | | | are coalesced to inventory This is the CoalesceMultipleObjectsToInventory setting in [Inventory] in OpenSimDefaults.ini Default is true. | ||||
* | Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more ↵ | Diva Canto | 2011-04-15 | 2 | -25/+12 |
| | | | | testing to make sure HG inventory isn't broken by this (it shouldn't). | ||||
* | refactor: separate out code that adds permissions | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -42/+59 |
| | |||||
* | minor: remove a small amount of code duplication | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -4/+3 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-04-15 | 2 | -3/+21 |
|\ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-04-14 | 5 | -11/+11 |
| |\ | |||||
| * | | Add ColladaMesh switch | BlueWall | 2011-04-14 | 2 | -3/+21 |
| | | | |||||
* | | | refactor: split out some rez code into a separate CreateItemForObject() method | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -143/+159 |
| |/ |/| | |||||
* | | get rid of all traces of the now used mock service infrastructure | Justin Clark-Casey (justincc) | 2011-04-15 | 5 | -11/+11 |
|/ | |||||
* | extend TestLoadCoalesecedItem() to check loaded object ids and positions | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -1/+7 |
| | |||||
* | Make all the objects in a coalescence reappears after being loaded from an ↵ | Justin Clark-Casey (justincc) | 2011-04-15 | 4 | -26/+49 |
| | | | | | | | 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. | ||||
* | implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet. | Justin Clark-Casey (justincc) | 2011-04-14 | 2 | -4/+48 |
| | |||||
* | simplify InventoryArchiveTestCase setup | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -18/+2 |
| | |||||
* | simplify TestSaveItemToIarV0_1() | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -18/+2 |
| | |||||
* | simplify TestRezObject() | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -17/+1 |
| | |||||
* | Make scene object parts created by the test utils unit sized. | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -3/+1 |
| | |||||
* | simplify coalesced object tests by using existing scene object set up utils | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -34/+6 |
| | | | | this change makes it possible to set an absolute position on a group before it is put into a scene. | ||||
* | Use common coalesced serialization code for both tests and the ↵ | Justin Clark-Casey (justincc) | 2011-04-13 | 1 | -54/+13 |
| | | | | | | InventoryAccessModule. Continue to restore original absolute positions of stored scene objects, though it's possible that these aren't used again | ||||
* | Adjust the quanterions used in the rez coalsced object tests to get sensible ↵ | Justin Clark-Casey (justincc) | 2011-04-13 | 1 | -4/+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-13 | 1 | -1/+1 |
| | | | | CoalescedSceneObjects from the serializer. | ||||
* | Fix bug where rezzing coalesced objects would give all objects the same name ↵ | Justin Clark-Casey (justincc) | 2011-04-13 | 2 | -7/+11 |
| | | | | | | | as the item. This now only happens for the first object (which was the item selected last when the coalesce was originally taken) This matches the expected behaviour of the environment as seen on the Linden Labs grid. | ||||
* | Add coalesced scene objects class and serializer. This is currently only ↵ | Justin Clark-Casey (justincc) | 2011-04-13 | 2 | -5/+93 |
| | | | | | | | | | 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. | ||||
* | factor out some test code into the SetUp() | Justin Clark-Casey (justincc) | 2011-04-13 | 1 | -14/+15 |
| | |||||
* | Add a regression test for rezzing a single object into a scene from user ↵ | Justin Clark-Casey (justincc) | 2011-04-13 | 2 | -0/+137 |
| | | | | inventory | ||||
* | Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to ↵ | Diva Canto | 2011-04-12 | 11 | -12/+2 |
| | | | | OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd. | ||||
* | Implemented terrain save-tile command. Does the opposite of load-tile. For ↵ | Diva Canto | 2011-04-12 | 7 | -0/+132 |
| | | | | now, only saves to .png. | ||||
* | refactor: simplify bRayEndIsIntersection boolean set from ↵ | Justin Clark-Casey (justincc) | 2011-04-12 | 1 | -14/+1 |
| | | | | RayEndIsIntersection byte | ||||
* | Fix (add) ability to rez objects by dragging them out of another prim's ↵ | Justin Clark-Casey (justincc) | 2011-04-12 | 1 | -0/+4 |
| | | | | | | | | 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. | ||||
* | minor: remove now inaccurate comment | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -1/+1 |
| | |||||
* | minor: adjust some spacing and indentation | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -10/+10 |
| | |||||
* | Implimented HTTP_VERIFY_CERT for llHttpRequest | E. Allen Soard | 2011-04-11 | 1 | -3/+31 |
| | |||||
* | Signal prim count taint if the AbsolutePosition of a scene object changes. | Justin Clark-Casey (justincc) | 2011-04-06 | 1 | -4/+26 |
| | | | | | 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. | ||||
* | Improve previous ILandObject method doc. | Justin Clark-Casey (justincc) | 2011-04-06 | 3 | -49/+87 |
| | | | | For test code, take a part name prefix when creating objects, so that these can be more easily identified in the logs | ||||
* | Add method doc to some land bitmap methods in ILandObject. | Justin Clark-Casey (justincc) | 2011-04-06 | 2 | -18/+48 |
| | | | | Also changes prim count tests to use the correct upper region bounds, though the method actually ignores the overage. | ||||
* | properly refresh object owner list when refresh button is hit on land parcel ↵ | Justin Clark-Casey (justincc) | 2011-04-05 | 2 | -9/+14 |
| | | | | object tab | ||||
* | remove now unused individual LandData prim counts. | Justin Clark-Casey (justincc) | 2011-04-05 | 3 | -105/+27 |
| | | | | | 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. | ||||
* | If an object is selected, then don't include it in owner/group/others prim ↵ | Justin Clark-Casey (justincc) | 2011-04-05 | 1 | -13/+18 |
| | | | | | | counts. This fixes the total prim count that the viewer displays when prims are selected - it appears to ignore the total that we pass it and adds up the counts separately. | ||||
* | Make the "All Estates" option work from the client (this makes chosen ↵ | Justin Clark-Casey (justincc) | 2011-04-05 | 2 | -7/+148 |
| | | | | | | | | 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 rezzing coalesced objects | Melanie | 2011-04-03 | 1 | -11/+0 |
| | |||||
* | Implement rezzing coalesced objects | Melanie | 2011-04-03 | 1 | -105/+172 |
| | |||||
* | Implement taking of coalesced objects. | Melanie | 2011-04-03 | 1 | -196/+263 |
| | | | | | | | 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. | ||||
* | Comment out some startup logging lines to make up for the one I added ↵ | Justin Clark-Casey (justincc) | 2011-04-02 | 1 | -2/+0 |
| | | | | | | earlier on. Most of these are where the region modules are telling us they are disabled. Convention is only to log when enabled (even that is really noisy) | ||||
* | If land is not group owned (group ID is always UUID.Zero) then don't check ↵ | Justin Clark-Casey (justincc) | 2011-04-02 | 1 | -2/+0 |
| | | | | if a prim should be added to the group count |