| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-22 | 2 | -2/+2 |
|\ |
|
| * | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2011-04-21 | 2 | -0/+25 |
| |\ |
|
| * \ | fix merge conflicts with OpenSimDefaults.ini | BlueWall | 2011-04-21 | 5 | -62/+163 |
| |\ \ |
|
| * | | | some mesh config asthetics | BlueWall | 2011-04-21 | 2 | -2/+2 |
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 5 | -38/+78 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-04-21 | 5 | -38/+78 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-04-21 | 5 | -62/+163 |
| | |\ \
| | | |/
| | |/| |
|
| | | * | Adjust freeswitch logging to be somewhat less noisy. However, there is still... | Justin Clark-Casey (justincc) | 2011-04-21 | 1 | -9/+18 |
| | | * | 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 |
| | | |\ |
|
| | | * | | Alter uuid gather so that it properly analyzes coalesced objects. | Justin Clark-Casey (justincc) | 2011-04-21 | 2 | -22/+43 |
| | * | | | Group collada meshies settings under [Mesh] in OpensimDefaults.ini | BlueWall | 2011-04-21 | 1 | -1/+2 |
| * | | | | Implement agent limits | Melanie | 2011-04-21 | 2 | -0/+25 |
| | |_|/
| |/| | |
|
* | | | | Add fix a minor bug | Melanie | 2011-04-21 | 1 | -1/+1 |
* | | | | Honor agent limit for region crossings and teleports | Melanie | 2011-04-21 | 1 | -0/+11 |
* | | | | Merge branch 'queuetest' into careminster-presence-refactor | Melanie | 2011-04-21 | 8 | -321/+245 |
|\ \ \ \ |
|
| * | | | | bug fix. Now when an unacked update packet is handled through ResendPrimUpdat... | Dan Lake | 2011-04-20 | 3 | -16/+25 |
| * | | | | Added an "immediate" queue to the priority queue. This is | Mic Bowman | 2011-04-20 | 2 | -247/+2 |
| * | | | | Adds the first pass at an adaptive throttle to slow start new | Mic Bowman | 2011-04-20 | 4 | -18/+95 |
| * | | | | Converted the property request queue to use the same retransmission | Mic Bowman | 2011-04-19 | 1 | -23/+52 |
| * | | | | Requeue unacknowledged entity updates rather than resend then "as is". | Dan Lake | 2011-04-19 | 3 | -54/+112 |
| | |/ /
| |/| | |
|
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 13 | -329/+469 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | fix meshing failure on sculpt maps smaller than 64x64 | dahlia | 2011-04-19 | 1 | -3/+10 |
| | |/
| |/| |
|
| * | | Get Viewer 2 voice working with OpenSim. | Justin Clark-Casey (justincc) | 2011-04-20 | 1 | -13/+66 |
| * | | Clean up freeswitch config to what is currently required. Add explanation to... | Justin Clark-Casey (justincc) | 2011-04-19 | 1 | -13/+15 |
| |/ |
|
| * | Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future co... | Justin Clark-Casey (justincc) | 2011-04-18 | 3 | -8/+12 |
| * | bump default IAR version to 0.2 and 1.1 for the --profile version. | Justin Clark-Casey (justincc) | 2011-04-18 | 1 | -2/+2 |
| * | bump oar version number to 0.6. | Justin Clark-Casey (justincc) | 2011-04-18 | 1 | -1/+1 |
| * | 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 inv... | Justin Clark-Casey (justincc) | 2011-04-18 | 1 | -106/+115 |
| * | refactor: rename DeleteToInventory() to CopyToInventory() | Justin Clark-Casey (justincc) | 2011-04-18 | 3 | -3/+20 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-18 | 2 | -17/+49 |
|\ \
| |/ |
|
| * | Fix bug where objects were being coalesced in the wrong positions. | Justin Clark-Casey (justincc) | 2011-04-18 | 1 | -2/+2 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-04-18 | 10 | -394/+505 |
| |\ |
|
| * | | Provide a configuration setting to control whether multiple taken objects are... | Justin Clark-Casey (justincc) | 2011-04-18 | 2 | -15/+47 |
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-18 | 10 | -381/+506 |
|\ \ \
| | |/
| |/| |
|
| * | | 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 |
| * | | 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 |
| |\ \ \ |
|
| | * | | | 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 |
| | * | | | 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 |
| | * | | | New tokenbucket algorithm. This one provides fair sharing of the queues | Mic Bowman | 2011-04-13 | 4 | -145/+259 |
| * | | | | 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 |