aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into queuetestMic Bowman2011-04-141-1/+5
|\
| * Comment out the warning if the prioritizer runs without a fullyMic Bowman2011-04-131-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
| |/
| * Use common coalesced serialization code for both tests and the InventoryAcces...Justin Clark-Casey (justincc)2011-04-131-54/+13
| * Adjust the quanterions used in the rez coalsced object tests to get sensible ...Justin Clark-Casey (justincc)2011-04-133-5/+24
| * refactor: move code to obtain the coalescence size and object offsets into Co...Justin Clark-Casey (justincc)2011-04-133-16/+39
| * Fix bug where rezzing coalesced objects would give all objects the same name ...Justin Clark-Casey (justincc)2011-04-132-7/+11
| * Add coalesced scene objects class and serializer. This is currently only use...Justin Clark-Casey (justincc)2011-04-138-9/+389
| * factor out some test code into the SetUp()Justin Clark-Casey (justincc)2011-04-131-14/+15
| * Add a regression test for rezzing a single object into a scene from user inve...Justin Clark-Casey (justincc)2011-04-134-1/+146
| * force mesh proxy for simple box prims with path cutdahlia2011-04-122-0/+6
| * Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to Open...Diva Canto2011-04-1230-472/+338
| * Implemented terrain save-tile command. Does the opposite of load-tile. For no...Diva Canto2011-04-127-0/+132
| * Bug fix in object serialization -- sculpt data was wrong.Diva Canto2011-04-121-1/+1
* | 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
| |\ \
| | * | 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
| * | | | | | | | 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
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Move example HttpProxy setting to OpenSim.ini.example and tidyJustin Clark-Casey (justincc)2011-04-122-9/+8
* | | | | | | | | minor typo correction. thanks Ai Austin.Justin Clark-Casey (justincc)2011-04-121-1/+1
* | | | | | | | | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-04-121-3/+3
* | | | | | | | | refactor: simplify bRayEndIsIntersection boolean set from RayEndIsIntersectio...Justin Clark-Casey (justincc)2011-04-122-26/+2
* | | | | | | | | If an object is rezzed directly from a prim inventory then give it the rotati...Justin Clark-Casey (justincc)2011-04-121-1/+1
* | | | | | | | | Allow a null rotation to be passed in to RezObject so that we can control whe...Justin Clark-Casey (justincc)2011-04-121-7/+13