aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\
| | * 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.
| | * 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.
| * | 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
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | 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
| | | | | | | |
| * | | | | | | slightly tweak OpenSim.ini.example textJustin Clark-Casey (justincc)2011-04-111-2/+2
| | | | | | | |
| * | | | | | | 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.
| * | | | | | | Add information comment to top of OpenSimDefaults.ini and make file consistentJustin Clark-Casey (justincc)2011-04-111-13/+22
| | | | | | | |
| * | | | | | | Add more instructions to OpenSim.ini.example to try and make it more ↵Justin Clark-Casey (justincc)2011-04-111-35/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | understandable for new users.
* | | | | | | | 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
| * \ \ \ \ \ \ Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into ↵Mic Bowman2011-04-040-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queuetest Conflicts: OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs OpenSim/Region/Framework/Scenes/Prioritizer.cs
| | * | | | | | | Implements adaptive queue management and fair queueing forMic Bowman2011-03-282-120/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improved networking performance. Reprioritization algorithms need to be ported still. One is in place.
| * | | | | | | | 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.
* | | | | | | | | Fixed the prioritizer functions for the new priority queuesMic Bowman2011-04-101-210/+82
| | | | | | | | |
* | | | | | | | | Implements adaptive queue management and fair queueing forMic Bowman2011-04-102-120/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improved networking performance. Reprioritization algorithms need to be ported still. One is in place.
* | | | | | | | | minor: remove mono compiler warningsJustin Clark-Casey (justincc)2011-04-091-4/+4
| | | | | | | | |