| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | switch up flavour to rc2 in preparation | Justin Clark-Casey (justincc) | 2011-04-23 | 1 | -1/+1 |
| | | |||||
| * | some mesh config asthetics0.7.1-rc1 | BlueWall | 2011-04-22 | 2 | -2/+2 |
| | | |||||
| * | change flavour to rc1 | Justin Clark-Casey (justincc) | 2011-04-21 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-04-21 | 8 | -80/+182 |
| |\ | |||||
| | * | Adjust freeswitch logging to be somewhat less noisy. However, there is ↵ | Justin Clark-Casey (justincc) | 2011-04-21 | 2 | -14/+21 |
| | | | | | | | | | still quite a large amount of logging present for debug purposes. | ||||
| | * | minor: small amount of method doc and some commented out odds and ends | Justin Clark-Casey (justincc) | 2011-04-21 | 1 | -6/+15 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-04-21 | 1 | -3/+10 |
| | |\ | |||||
| | | * | fix meshing failure on sculpt maps smaller than 64x64 | dahlia | 2011-04-19 | 1 | -3/+10 |
| | | | | |||||
| | * | | Alter uuid gather so that it properly analyzes coalesced objects. | Justin Clark-Casey (justincc) | 2011-04-21 | 2 | -22/+43 |
| | |/ | | | | | | | This should correct save all the assets required for the items within the coalesced objects in an IAR. This should also correctly gather the items on hypergrid takes. | ||||
| | * | Get Viewer 2 voice working with OpenSim. | Justin Clark-Casey (justincc) | 2011-04-20 | 2 | -14/+67 |
| | | | | | | | | | | | | | | | | | See http://opensimulator.org/mantis/view.php?id=5336 It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php. This would send it into a continuous login loop. Viewer 1 was quite happy to ignore the lack of response. This commit puts in the bare minimum 'OK' message in response to viv_watcher.php. This allows viewer 2 voice to connect and appears to work. However, at some point we need to fill out the watcher response, whatever that is. | ||||
| | * | Clean up freeswitch config to what is currently required. Add explanation ↵ | Justin Clark-Casey (justincc) | 2011-04-19 | 3 | -27/+32 |
| | | | | | | | | | to config parameters. Clean up some log messages. | ||||
| * | | Group collada meshies settings under [Mesh] in OpensimDefaults.ini | BlueWall | 2011-04-21 | 1 | -1/+2 |
| |/ | |||||
| * | Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future ↵ | Justin Clark-Casey (justincc) | 2011-04-18 | 3 | -8/+12 |
| | | | | | | | | config parameters. Default remains true. OpenSimDefault.ini changed so if you haven't overriden this switch then you don't need to do anything. | ||||
| * | 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 | 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 |
| | |\ \ \ \ \ \ | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |