aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-04-218-53/+87
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-04-2113-126/+274
| |\
| | * Remove duplicated freeswitch settings.Justin Clark-Casey (justincc)2011-04-211-4/+0
| | * Adjust freeswitch logging to be somewhat less noisy. However, there is still...Justin Clark-Casey (justincc)2011-04-212-14/+21
| | * minor: small amount of method doc and some commented out odds and endsJustin Clark-Casey (justincc)2011-04-211-6/+15
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-04-211-3/+10
| | |\
| | * | Alter uuid gather so that it properly analyzes coalesced objects.Justin Clark-Casey (justincc)2011-04-212-22/+43
| * | | Group collada meshies settings under [Mesh] in OpensimDefaults.iniBlueWall2011-04-212-7/+8
* | | | Implement agent limitsMelanie2011-04-212-0/+25
| |_|/ |/| |
* | | fix meshing failure on sculpt maps smaller than 64x64dahlia2011-04-191-3/+10
| |/ |/|
* | Get Viewer 2 voice working with OpenSim.Justin Clark-Casey (justincc)2011-04-202-14/+67
* | synchronize Robust.HG.ini.example FreeSWITCH config with other config filesJustin Clark-Casey (justincc)2011-04-191-10/+32
* | For consistency, uncomment ColladaMesh option in OpenSimDefaults.ini. Thanks...Justin Clark-Casey (justincc)2011-04-191-1/+1
* | Clean up freeswitch config to what is currently required. Add explanation to...Justin Clark-Casey (justincc)2011-04-196-62/+95
|/
* Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future co...Justin Clark-Casey (justincc)2011-04-184-12/+18
* bump default IAR version to 0.2 and 1.1 for the --profile version.Justin Clark-Casey (justincc)2011-04-181-2/+2
* bump oar version number to 0.6.Justin Clark-Casey (justincc)2011-04-181-1/+1
* Add regression test to check that OARs start with the control file.Justin Clark-Casey (justincc)2011-04-183-9/+21
* add test to ensure that an IAR starts with the control fileJustin Clark-Casey (justincc)2011-04-182-11/+39
* refactor: split out the code which actually copies a particular bundle to inv...Justin Clark-Casey (justincc)2011-04-181-106/+115
* refactor: rename DeleteToInventory() to CopyToInventory()Justin Clark-Casey (justincc)2011-04-183-3/+20
* Fix bug where objects were being coalesced in the wrong positions.Justin Clark-Casey (justincc)2011-04-181-2/+2
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-04-1814-425/+537
|\
| * Merge branch 'master' into test-merge0418Mic Bowman2011-04-1822-801/+626
| |\
| * | Remove the call to remove tokens from the parent. Under heavy loadMic Bowman2011-04-152-5/+14
| * | Merge branch 'master' into queuetestMic Bowman2011-04-141-1/+5
| |\ \
| * \ \ Merge branch 'testmerge' into queuetestMic Bowman2011-04-1350-541/+1075
| |\ \ \
| | * | | remove packet monitoring debugging codeMic Bowman2011-04-131-116/+2
| | * | | Fixed the update of items in the priority queue to enable bothMic Bowman2011-04-133-7/+21
| | * | | fixed a couple bugs with the property queuesMic Bowman2011-04-131-1/+37
| | * | | First pass at moving object property requests into a queue similarMic Bowman2011-04-1311-208/+262
| | * | | New tokenbucket algorithm. This one provides fair sharing of the queuesMic Bowman2011-04-134-145/+259
| * | | | Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queu...Mic Bowman2011-04-133-4/+26
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of /home/git/repo/OpenSim into queuetestBlueWall2011-04-137-43/+99
| | |\ \ \ \
| | * | | | | remove packet monitoring debugging codeMic Bowman2011-04-121-116/+2
| | * | | | | Fixed the update of items in the priority queue to enable bothMic Bowman2011-04-123-7/+21
| | * | | | | fixed a couple bugs with the property queuesMic Bowman2011-04-121-1/+37
| | * | | | | Merge branch 'test-select' into queuetestMic Bowman2011-04-1211-208/+262
| | |\ \ \ \ \
| | | * | | | | First pass at moving object property requests into a queue similarMic Bowman2011-04-1211-208/+262
| | * | | | | | Merge branch 'master' into queuetestMic Bowman2011-04-128-74/+158
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | New tokenbucket algorithm. This one provides fair sharing of the queuesMic Bowman2011-04-114-145/+259
| * | | | | | | remove packet monitoring debugging codeMic Bowman2011-04-121-116/+2
| * | | | | | | Fixed the update of items in the priority queue to enable bothMic Bowman2011-04-123-7/+21
| * | | | | | | fixed a couple bugs with the property queuesMic Bowman2011-04-121-1/+37
| * | | | | | | First pass at moving object property requests into a queue similarMic Bowman2011-04-1211-208/+262
| * | | | | | | New tokenbucket algorithm. This one provides fair sharing of the queuesMic Bowman2011-04-124-145/+259
* | | | | | | | Provide a configuration setting to control whether multiple taken objects are...Justin Clark-Casey (justincc)2011-04-183-15/+54
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Mantis #5442: Add admin_save_heightmapMelanie2011-04-171-0/+56
* | | | | | | More descriptive debug msg for ServiceOSDRequest failures.Dan Lake2011-04-161-2/+2
* | | | | | | Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more tes...Diva Canto2011-04-152-25/+12
generated by cgit v1.1 at 2024-11-18 11:13:49 +0000