aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
| * | | | | | | Make remote admin error messages more helpful on windows.Justin Clark-Casey (justincc)2011-04-151-88/+73
| * | | | | | | refactor: separate out code that adds permissionsJustin Clark-Casey (justincc)2011-04-151-42/+59
| * | | | | | | Merge branch 'master' of /home/opensim/lib/develop/BlueWallBlueWall2011-04-151-1/+34
| |\ \ \ \ \ \ \
| | * | | | | | | Thanks Snoopy for a patch that allows setting of perms on items given to new ...BlueWall2011-04-151-1/+34
| | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Add ColladaMesh switchBlueWall2011-04-133-4/+26
| | * | | | | | Merge branch 'master' of /home/git/repo/OpenSimBlueWall2011-04-13154-7522/+3275
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Merge branch 'master' of /home/opensim/src/OpenSim/CoreBlueWall2011-03-2197-1508/+2109
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of /home/opensim/src/OpenSim/CoreBlueWall2011-02-142-14/+8
| | |\ \ \ \ \ \ \
| | * | | | | | | | Set filter to send proper rotations for root partBlueWall2011-02-131-1/+1
| | * | | | | | | | Revert "Fix unsitting of avatar on linked sets"BlueWall2011-02-131-1/+1
| | * | | | | | | | Fix unsitting of avatar on linked setsBlueWall2011-02-121-1/+1
| | * | | | | | | | Merge branch 'master' of /home/opensim/src/OpenSim/CoreBlueWall2011-02-1259-2164/+1164
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of /home/opensim/src/OpenSim/CoreBlueWall2011-02-0931-163/+1037
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of /home/opensim/src/OpenSim/CoreBlueWall2011-01-2760-699/+898
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Make FireAndForgetWrapper a singleton classBlueWall2011-01-133-5/+24
| * | | | | | | | | | | | minor: remove a small amount of code duplicationJustin Clark-Casey (justincc)2011-04-151-4/+3
| * | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-04-153-4/+26
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-04-148-53/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add ColladaMesh switchBlueWall2011-04-143-4/+26
| * | | | | | | | | | | | | | refactor: split out some rez code into a separate CreateItemForObject() methodJustin Clark-Casey (justincc)2011-04-151-143/+159
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | get rid of all traces of the now used mock service infrastructureJustin Clark-Casey (justincc)2011-04-158-45/+17
| * | | | | | | | | | | | | remove old code for a mock grid service, which got removed some time backJustin Clark-Casey (justincc)2011-04-151-8/+3
| |/ / / / / / / / / / / /