aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)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
| | | | | | | | | | initialized scene presence. Not sure why we are dumping updates to a client that isn't there yet...
* | Merge branch 'testmerge' into queuetestMic Bowman2011-04-1350-541/+1075
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
| * | 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
| | | | | | | | | | | | | | | | | | types of property updates to be specified. Not sure if one form of property update should supercede another. But for now the old OpenSim behavior is preserved by sending both.
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | to the entity update queue. The number of property packets can become significant when selecting/deselecting large numbers of objects. This is experimental code.
| * | New tokenbucket algorithm. This one provides fair sharing of the queuesMic Bowman2011-04-134-145/+259
| |/ | | | | | | | | | | | | | | | | when client and simulator throttles are set. This algorithm also uses pre-defined burst rate of 150% of the sustained rate for each of the throttles. Removed the "state" queue. The state queue is not a Linden queue and appeared to be used just to get kill packets sent.
| * Use common coalesced serialization code for both tests and the ↵Justin Clark-Casey (justincc)2011-04-131-54/+13
| | | | | | | | | | | | InventoryAccessModule. Continue to restore original absolute positions of stored scene objects, though it's possible that these aren't used again
| * Adjust the quanterions used in the rez coalsced object tests to get sensible ↵Justin Clark-Casey (justincc)2011-04-133-5/+24
| | | | | | | | | | | | bounding box and offset numbers. Extend test to check position of objects in the rezzed coalescence.
| * refactor: move code to obtain the coalescence size and object offsets into ↵Justin Clark-Casey (justincc)2011-04-133-16/+39
| | | | | | | | CoalescedSceneObjects from the serializer.
| * Fix bug where rezzing coalesced objects would give all objects the same name ↵Justin Clark-Casey (justincc)2011-04-132-7/+11
| | | | | | | | | | | | | | as the item. This now only happens for the first object (which was the item selected last when the coalesce was originally taken) This matches the expected behaviour of the environment as seen on the Linden Labs grid.
| * Add coalesced scene objects class and serializer. This is currently only ↵Justin Clark-Casey (justincc)2011-04-138-9/+389
| | | | | | | | | | | | | | | | | | used by the TestRezCoalescedObject() regression test. This structure matches the existing one for SceneObjects and will allow code to be reused by the uuid gatherer, other tests, etc. Test is not yet fully implemented due to a bug in rezzing coalesced objects where they all get the same name as the item. Only one object should get the same name as the item, which appears to be the one selected last when the the objects were coalesced in the first place. This bug will be addressed shortly.
| * 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 ↵Justin Clark-Casey (justincc)2011-04-134-1/+146
| | | | | | | | inventory
| * 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 ↵Diva Canto2011-04-1230-472/+338
| | | | | | | | OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.
| * Implemented terrain save-tile command. Does the opposite of load-tile. For ↵Diva Canto2011-04-127-0/+132
| | | | | | | | now, only saves to .png.
| * 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 ↵Mic Bowman2011-04-133-4/+26
|\ \ | | | | | | | | | queuetest
| * \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the root prim, alone or in a set, to send it's rotation. This fixes unsitting the avatar on sit-offsest type teleports where the sit target is in the root prim of a linkset.
| | * | | | Revert "Fix unsitting of avatar on linked sets"BlueWall2011-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b492f1ce99d27bcf29eb5805564c8778aa4df748.
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made FireAndForgetWrapper a singleton class to allow us to drop dependancy on the BclExtras35 library. BclExtras is broken in Mono 2.8.2 and we used the library in only one function.
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types of property updates to be specified. Not sure if one form of property update should supercede another. But for now the old OpenSim behavior is preserved by sending both.
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the entity update queue. The number of property packets can become significant when selecting/deselecting large numbers of objects. This is experimental code.
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when client and simulator throttles are set. This algorithm also uses pre-defined burst rate of 150% of the sustained rate for each of the throttles. Removed the "state" queue. The state queue is not a Linden queue and appeared to be used just to get kill packets sent.
* | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types of property updates to be specified. Not sure if one form of property update should supercede another. But for now the old OpenSim behavior is preserved by sending both.
* | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the entity update queue. The number of property packets can become significant when selecting/deselecting large numbers of objects. This is experimental code.
* | | | | | | | | | New tokenbucket algorithm. This one provides fair sharing of the queuesMic Bowman2011-04-124-145/+259
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when client and simulator throttles are set. This algorithm also uses pre-defined burst rate of 150% of the sustained rate for each of the throttles. Removed the "state" queue. The state queue is not a Linden queue and appeared to be used just to get kill packets sent.
* | | | | | | | | 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 ↵Justin Clark-Casey (justincc)2011-04-122-26/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RayEndIsIntersection byte
* | | | | | | | | If an object is rezzed directly from a prim inventory then give it the ↵Justin Clark-Casey (justincc)2011-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rotation it was stored with.
* | | | | | | | | Allow a null rotation to be passed in to RezObject so that we can control ↵Justin Clark-Casey (justincc)2011-04-121-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whether to use the serialized rotation or not. Not used yet.