| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
|/ |
|
* | Get Viewer 2 voice working with OpenSim. | Justin Clark-Casey (justincc) | 2011-04-20 | 2 | -14/+67 |
* | synchronize Robust.HG.ini.example FreeSWITCH config with other config files | Justin Clark-Casey (justincc) | 2011-04-19 | 1 | -10/+32 |
* | For consistency, uncomment ColladaMesh option in OpenSimDefaults.ini. Thanks... | Justin Clark-Casey (justincc) | 2011-04-19 | 1 | -1/+1 |
* | Clean up freeswitch config to what is currently required. Add explanation to... | Justin Clark-Casey (justincc) | 2011-04-19 | 6 | -62/+95 |
* | Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future co... | Justin Clark-Casey (justincc) | 2011-04-18 | 4 | -12/+18 |
* | 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 |
* | 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 | 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 |
| * | | Merge branch 'master' into queuetest | Mic Bowman | 2011-04-14 | 1 | -1/+5 |
| |\ \ |
|
| * \ \ | Merge branch 'testmerge' into queuetest | Mic Bowman | 2011-04-13 | 50 | -541/+1075 |
| |\ \ \ |
|
| | * | | | 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 |
| | * | | | 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 |
| | * | | | New tokenbucket algorithm. This one provides fair sharing of the queues | Mic Bowman | 2011-04-13 | 4 | -145/+259 |
| * | | | | Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queu... | Mic Bowman | 2011-04-13 | 3 | -4/+26 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge branch 'master' of /home/git/repo/OpenSim into queuetest | BlueWall | 2011-04-13 | 7 | -43/+99 |
| | |\ \ \ \ |
|
| | * | | | | | 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 |
| | * | | | | | 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 |
| | * | | | | | | Merge branch 'master' into queuetest | Mic Bowman | 2011-04-12 | 8 | -74/+158 |
| | |\ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | * | | | | | | New tokenbucket algorithm. This one provides fair sharing of the queues | Mic Bowman | 2011-04-11 | 4 | -145/+259 |
| * | | | | | | | 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 |
| * | | | | | | | fixed a couple bugs with the property queues | Mic Bowman | 2011-04-12 | 1 | -1/+37 |
| * | | | | | | | First pass at moving object property requests into a queue similar | Mic Bowman | 2011-04-12 | 11 | -208/+262 |
| * | | | | | | | New tokenbucket algorithm. This one provides fair sharing of the queues | Mic Bowman | 2011-04-12 | 4 | -145/+259 |
* | | | | | | | | Provide a configuration setting to control whether multiple taken objects are... | Justin Clark-Casey (justincc) | 2011-04-18 | 3 | -15/+54 |
| |_|_|_|_|_|/
|/| | | | | | |
|
* | | | | | | | 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 tes... | Diva Canto | 2011-04-15 | 2 | -25/+12 |
* | | | | | | | Make remote admin error messages more helpful on windows. | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -88/+73 |
* | | | | | | | 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 |
| | |_|_|/ / /
| |/| | | | | |
|
| * | | | | | | Add ColladaMesh switch | BlueWall | 2011-04-13 | 3 | -4/+26 |
| * | | | | | | Merge branch 'master' of /home/git/repo/OpenSim | BlueWall | 2011-04-13 | 154 | -7522/+3275 |
| |\ \ \ \ \ \
| | |/ / / / / |
|
| * | | | | | | Merge branch 'master' of /home/opensim/src/OpenSim/Core | BlueWall | 2011-03-21 | 97 | -1508/+2109 |
| |\ \ \ \ \ \ |
|