aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Remove the call to remove tokens from the parent. Under heavy loadMic Bowman2011-04-152-5/+14
| | | | | | | | | | this appears to cause problems with the system timer resolution. This caused a problem with tokens going into the root throttle as bursts leading to some starvation. Also changed EnqueueOutgoing to always queue a packet if there are already packets in the queue. Ensures consistent ordering of packet sends.
* 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-1349-540/+1074
|\ \ | | | | | | | | | | | | 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-133-1/+145
| | | | | | | | 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-1229-471/+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 'master' of /home/git/repo/OpenSim into queuetestBlueWall2011-04-135-32/+85
|\ \
| * | Add ColladaMesh switchBlueWall2011-04-132-3/+21
| |/
| * 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.
| * Fix (add) ability to rez objects by dragging them out of another prim's ↵Justin Clark-Casey (justincc)2011-04-122-5/+58
| | | | | | | | | | | | | | | | inventory. This should happen if the client supplies a task ID with the RezObject call. The rez goes through the same code as llRezObject(), so the same perms are applied. Rotation isn't yet preserved, this should be fixed shortly.
* | 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-126-26/+68
|\ \ \ | |/ / |/| / | |/
| * minor: add a bit more method doc to IInventoryService.GetItem()Justin Clark-Casey (justincc)2011-04-111-1/+1
| |
| * Include code to return more information about the NullReferenceException seen inJustin Clark-Casey (justincc)2011-04-111-2/+13
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5403 prior to doing something about it.
| * minor: remove now inaccurate commentJustin Clark-Casey (justincc)2011-04-111-1/+1
| |
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-04-111-10/+4
| |
| * minor: adjust some spacing and indentationJustin Clark-Casey (justincc)2011-04-111-10/+10
| |
| * Implimented HTTP_VERIFY_CERT for llHttpRequestE. Allen Soard2011-04-111-3/+31
| |
| * create "config show" as a region console command synonym for "config get".Justin Clark-Casey (justincc)2011-04-111-5/+13
| | | | | | | | This is to create greater consistency with all the other show commands.
| * Make it more obvious when it happens that DLL plugin loading fails. Improve ↵Justin Clark-Casey (justincc)2011-04-111-1/+2
| | | | | | | | exception output on Windows.
* | 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.
* Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into ↵Mic Bowman2011-04-111-1/+75
|\ | | | | | | | | | | | | | | queuetest Conflicts: OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs OpenSim/Region/Framework/Scenes/Prioritizer.cs
| * Fix a bug in the computation of the RTO. Basically... the RTO (theMic Bowman2011-04-041-2/+2
| | | | | | | | | | | | | | | | time to wait to retransmit packets) always maxed out (no retransmissions for 24 or 48 seconds. Note that this is going to cause faster (and more) retransmissions. Fix for dynamic throttling needs to go with this.
| * Fixed the prioritizer functions for the new priority queuesMic Bowman2011-04-041-210/+82
| |
| * Implements adaptive queue management and fair queueing forMic Bowman2011-04-042-120/+304
| | | | | | | | | | | | | | improved networking performance. Reprioritization algorithms need to be ported still. One is in place.
* | Removed some priority queue debugging codeMic Bowman2011-04-111-80/+0
| |
* | Changed the "not in scene" check in the prioritizier to justMic Bowman2011-04-101-2/+3
| | | | | | | | | | | | a warning. There appears to be a race condition on slow logins that attempts to prioritize before the scene presence is fully initialized.
* | Split the priority queue class into a seperate file. LLClientViewMic Bowman2011-04-102-205/+245
| | | | | | | | is big enough.
* | Fix a bug in the computation of the RTO. Basically... the RTO (theMic Bowman2011-04-101-2/+2
| | | | | | | | | | | | | | | | time to wait to retransmit packets) always maxed out (no retransmissions for 24 or 48 seconds. Note that this is going to cause faster (and more) retransmissions. Fix for dynamic throttling needs to go with this.