Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 45 | -131/+882 |
|\ | |||||
| * | 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 | 7 | -15/+15 |
| | |\ | |||||
| | * | | 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 | 7 | -15/+15 |
| |/ | |||||
| * | remove mock asset service for tests in favour of always using the real one | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -1/+3 |
| | | |||||
| * | 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 | 5 | -32/+90 |
| | | | | | | | | | | | | | | 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 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -1/+5 |
| |\ | |||||
| | * | Comment out the warning if the prioritizer runs without a fully | Mic Bowman | 2011-04-13 | 1 | -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 utils | Justin Clark-Casey (justincc) | 2011-04-14 | 2 | -41/+20 |
| |/ | | | | | | | 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 | 3 | -5/+24 |
| | | | | | | | | | | | | 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 | 3 | -16/+39 |
| | | | | | | | | 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 | 7 | -9/+374 |
| | | | | | | | | | | | | | | | | | | 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 | 3 | -1/+145 |
| | | | | | | | | inventory | ||||
| * | force mesh proxy for simple box prims with path cut | dahlia | 2011-04-12 | 2 | -0/+6 |
| | | |||||
| * | 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. | ||||
| * | Bug fix in object serialization -- sculpt data was wrong. | Diva Canto | 2011-04-12 | 1 | -1/+1 |
| | | |||||
| * | refactor: simplify bRayEndIsIntersection boolean set from ↵ | Justin Clark-Casey (justincc) | 2011-04-12 | 2 | -26/+2 |
| | | | | | | | | RayEndIsIntersection byte | ||||
| * | If an object is rezzed directly from a prim inventory then give it the ↵ | Justin Clark-Casey (justincc) | 2011-04-12 | 1 | -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-12 | 1 | -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-12 | 2 | -5/+58 |
| | | | | | | | | | | | | | | | | 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-refactor | Melanie | 2011-04-12 | 8 | -510/+677 |
|\ \ | |/ | |||||
| * | minor: remove now inaccurate comment | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -1/+1 |
| | | |||||
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -10/+4 |
| | | |||||
| * | 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 |
| | | |||||
| * | create "config show" as a region console command synonym for "config get". | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -5/+13 |
| | | | | | | | | This is to create greater consistency with all the other show commands. | ||||
| * | Make it more obvious when it happens that DLL plugin loading fails. Improve ↵ | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -1/+2 |
| | | | | | | | | exception output on Windows. | ||||
| * | Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into ↵ | Mic Bowman | 2011-04-11 | 1 | -1/+75 |
| |\ | | | | | | | | | | | | | | | | | | | | | | queuetest Conflicts: OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs OpenSim/Region/Framework/Scenes/Prioritizer.cs | ||||
| | * | Fix a bug in the computation of the RTO. Basically... the RTO (the | Mic Bowman | 2011-04-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | time to wait to retransmit packets) always maxed out (no retransmissions for 24 or 48 seconds. Note that this is going to cause faster (and more) retransmissions. Fix for dynamic throttling needs to go with this. | ||||
| | * | Fixed the prioritizer functions for the new priority queues | Mic Bowman | 2011-04-04 | 1 | -210/+82 |
| | | | |||||
| | * | Implements adaptive queue management and fair queueing for | Mic Bowman | 2011-04-04 | 2 | -120/+304 |
| | | | | | | | | | | | | | | | | | | | | | improved networking performance. Reprioritization algorithms need to be ported still. One is in place. | ||||
| * | | Removed some priority queue debugging code | Mic Bowman | 2011-04-11 | 1 | -80/+0 |
| | | | |||||
| * | | Changed the "not in scene" check in the prioritizier to just | Mic Bowman | 2011-04-10 | 1 | -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. | ||||
| * | | Split the priority queue class into a seperate file. LLClientView | Mic Bowman | 2011-04-10 | 2 | -205/+245 |
| | | | | | | | | | | | | is big enough. | ||||
| * | | Fix a bug in the computation of the RTO. Basically... the RTO (the | Mic Bowman | 2011-04-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | time to wait to retransmit packets) always maxed out (no retransmissions for 24 or 48 seconds. Note that this is going to cause faster (and more) retransmissions. Fix for dynamic throttling needs to go with this. |