| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | Merge branch 'master' into test-merge0418 | Mic Bowman | 2011-04-18 | 14 | -340/+398 | |
| | |\ | ||||||
| | * | | Remove the call to remove tokens from the parent. Under heavy load | Mic Bowman | 2011-04-15 | 2 | -5/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this appears to cause problems with the system timer resolution. This caused a problem with tokens going into the root throttle as bursts leading to some starvation. Also changed EnqueueOutgoing to always queue a packet if there are already packets in the queue. Ensures consistent ordering of packet sends. | |||||
| | * | | Merge branch 'master' into queuetest | Mic Bowman | 2011-04-14 | 1 | -1/+5 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'testmerge' into queuetest | Mic Bowman | 2011-04-13 | 30 | -81/+723 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||||
| | | * | | | remove packet monitoring debugging code | Mic Bowman | 2011-04-13 | 1 | -116/+2 | |
| | | | | | | ||||||
| | | * | | | Fixed the update of items in the priority queue to enable both | Mic Bowman | 2011-04-13 | 2 | -7/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types of property updates to be specified. Not sure if one form of property update should supercede another. But for now the old OpenSim behavior is preserved by sending both. | |||||
| | | * | | | fixed a couple bugs with the property queues | Mic Bowman | 2011-04-13 | 1 | -1/+37 | |
| | | | | | | ||||||
| | | * | | | First pass at moving object property requests into a queue similar | Mic Bowman | 2011-04-13 | 7 | -177/+235 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the entity update queue. The number of property packets can become significant when selecting/deselecting large numbers of objects. This is experimental code. | |||||
| | | * | | | New tokenbucket algorithm. This one provides fair sharing of the queues | Mic Bowman | 2011-04-13 | 4 | -145/+259 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when client and simulator throttles are set. This algorithm also uses pre-defined burst rate of 150% of the sustained rate for each of the throttles. Removed the "state" queue. The state queue is not a Linden queue and appeared to be used just to get kill packets sent. | |||||
| | * | | | | Merge branch 'master' of /home/git/repo/OpenSim into queuetest | BlueWall | 2011-04-13 | 4 | -29/+82 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Add ColladaMesh switch | BlueWall | 2011-04-13 | 2 | -3/+21 | |
| | | | | | | | ||||||
| | * | | | | | remove packet monitoring debugging code | Mic Bowman | 2011-04-12 | 1 | -116/+2 | |
| | | | | | | | ||||||
| | * | | | | | Fixed the update of items in the priority queue to enable both | Mic Bowman | 2011-04-12 | 2 | -7/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types of property updates to be specified. Not sure if one form of property update should supercede another. But for now the old OpenSim behavior is preserved by sending both. | |||||
| | * | | | | | fixed a couple bugs with the property queues | Mic Bowman | 2011-04-12 | 1 | -1/+37 | |
| | | | | | | | ||||||
| | * | | | | | Merge branch 'test-select' into queuetest | Mic Bowman | 2011-04-12 | 7 | -177/+235 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | First pass at moving object property requests into a queue similar | Mic Bowman | 2011-04-12 | 7 | -177/+235 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 queuetest | Mic Bowman | 2011-04-12 | 4 | -23/+54 | |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | | New tokenbucket algorithm. This one provides fair sharing of the queues | Mic Bowman | 2011-04-11 | 4 | -145/+259 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when client and simulator throttles are set. This algorithm also uses pre-defined burst rate of 150% of the sustained rate for each of the throttles. Removed the "state" queue. The state queue is not a Linden queue and appeared to be used just to get kill packets sent. | |||||
| * | | | | | | | 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 | 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 | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |