| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | 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 | 3 | -3/+20 | |
| | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-04-18 | 14 | -425/+537 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' into test-merge0418 | Mic Bowman | 2011-04-18 | 22 | -801/+626 | |
| | |\ \ \ \ | ||||||
| | * | | | | | 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 | 49 | -540/+1074 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -7/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 11 | -208/+262 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 5 | -32/+85 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | 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 | 3 | -7/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 11 | -208/+262 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | First pass at moving object property requests into a queue similar | Mic Bowman | 2011-04-12 | 11 | -208/+262 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 6 | -26/+68 | |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| | * | | | | | | | | | 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. | |||||
| * | | | | | | | | | Mantis #5442: Add admin_save_heightmap | Melanie | 2011-04-17 | 1 | -0/+56 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | More descriptive debug msg for ServiceOSDRequest failures. | Dan Lake | 2011-04-16 | 1 | -2/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | 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). | |||||
| * | | | | | | | | | Make remote admin error messages more helpful on windows. | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -88/+73 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, make log messages conform more with convention. | |||||
| * | | | | | | | | | refactor: separate out code that adds permissions | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -42/+59 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' of /home/opensim/lib/develop/BlueWall | BlueWall | 2011-04-15 | 1 | -1/+34 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Thanks Snoopy for a patch that allows setting of perms on items given to new ↵ | BlueWall | 2011-04-15 | 1 | -1/+34 | |
| | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | avatars | |||||
| | * | | | | | | | | Add ColladaMesh switch | BlueWall | 2011-04-13 | 2 | -3/+21 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | 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 | 8 | -53/+20 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | 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 | 8 | -45/+17 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | remove old code for a mock grid service, which got removed some time back | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -8/+3 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | remove any reference to a mock authentication service since it doesn't exist ↵ | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -12/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and we don't use it | |||||
| * | | | | | | | | | remove mock asset service for tests in favour of always using the real one | Justin Clark-Casey (justincc) | 2011-04-15 | 3 | -133/+8 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Remove the mock inventory service for tests and just use the real one all ↵ | Justin Clark-Casey (justincc) | 2011-04-15 | 2 | -199/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the time with an in-memory data plugin | |||||
| * | | | | | | | | | 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 | 10 | -39/+134 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -6/+64 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | 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 | 2 | -5/+3 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | 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. | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |