Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of /home/git/repo/OpenSim into queuetest | BlueWall | 2011-04-13 | 7 | -43/+99 |
|\ | |||||
| * | Add ColladaMesh switch | BlueWall | 2011-04-13 | 3 | -4/+26 |
| | | |||||
| * | Merge branch 'master' of /home/git/repo/OpenSim | BlueWall | 2011-04-13 | 154 | -7522/+3275 |
| |\ | |||||
| | * | Move example HttpProxy setting to OpenSim.ini.example and tidy | Justin Clark-Casey (justincc) | 2011-04-12 | 2 | -9/+8 |
| | | | |||||
| | * | minor typo correction. thanks Ai Austin. | Justin Clark-Casey (justincc) | 2011-04-12 | 1 | -1/+1 |
| | | | |||||
| | * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-04-12 | 1 | -3/+3 |
| | | | |||||
| | * | refactor: simplify bRayEndIsIntersection boolean set from ↵ | Justin Clark-Casey (justincc) | 2011-04-12 | 2 | -26/+2 |
| | | | | | | | | | | | | RayEndIsIntersection byte | ||||
| | * | If an object is rezzed directly from a prim inventory then give it the ↵ | Justin Clark-Casey (justincc) | 2011-04-12 | 1 | -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-12 | 1 | -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-12 | 2 | -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/Core | BlueWall | 2011-03-21 | 97 | -1508/+2109 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of /home/opensim/src/OpenSim/Core | BlueWall | 2011-02-14 | 2 | -14/+8 |
| |\ \ \ | |||||
| * | | | | Set filter to send proper rotations for root part | BlueWall | 2011-02-13 | 1 | -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" | BlueWall | 2011-02-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit b492f1ce99d27bcf29eb5805564c8778aa4df748. | ||||
| * | | | | Fix unsitting of avatar on linked sets | BlueWall | 2011-02-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' of /home/opensim/src/OpenSim/Core | BlueWall | 2011-02-12 | 59 | -2164/+1164 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of /home/opensim/src/OpenSim/Core | BlueWall | 2011-02-09 | 31 | -163/+1037 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of /home/opensim/src/OpenSim/Core | BlueWall | 2011-01-27 | 60 | -699/+898 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Make FireAndForgetWrapper a singleton class | BlueWall | 2011-01-13 | 3 | -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 code | Mic Bowman | 2011-04-12 | 1 | -116/+2 |
| | | | | | | | | |||||
* | | | | | | | | Fixed the update of items in the priority queue to enable both | Mic Bowman | 2011-04-12 | 3 | -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 queues | Mic Bowman | 2011-04-12 | 1 | -1/+37 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'test-select' into queuetest | Mic Bowman | 2011-04-12 | 11 | -208/+262 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | First pass at moving object property requests into a queue similar | Mic Bowman | 2011-04-12 | 11 | -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 queuetest | Mic Bowman | 2011-04-12 | 8 | -74/+158 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | minor: add a bit more method doc to IInventoryService.GetItem() | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Include code to return more information about the NullReferenceException seen in | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5403 prior to doing something about it. | ||||
| * | | | | | | | minor: remove now inaccurate comment | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -10/+4 |
| | | | | | | | | |||||
| * | | | | | | | minor: adjust some spacing and indentation | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -10/+10 |
| | | | | | | | | |||||
| * | | | | | | | Implimented HTTP_VERIFY_CERT for llHttpRequest | E. Allen Soard | 2011-04-11 | 1 | -3/+31 |
| | | | | | | | | |||||
| * | | | | | | | slightly tweak OpenSim.ini.example text | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | create "config show" as a region console command synonym for "config get". | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -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-11 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exception output on Windows. | ||||
| * | | | | | | | Add information comment to top of OpenSimDefaults.ini and make file consistent | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -13/+22 |
| | | | | | | | | |||||
| * | | | | | | | Add more instructions to OpenSim.ini.example to try and make it more ↵ | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -35/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | understandable for new users. | ||||
* | | | | | | | | New tokenbucket algorithm. This one provides fair sharing of the queues | Mic Bowman | 2011-04-11 | 4 | -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 Bowman | 2011-04-11 | 1 | -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 Bowman | 2011-04-04 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queuetest Conflicts: OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs OpenSim/Region/Framework/Scenes/Prioritizer.cs | ||||
| | * | | | | | | | Implements adaptive queue management and fair queueing for | Mic Bowman | 2011-03-28 | 2 | -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 (the | Mic Bowman | 2011-04-04 | 1 | -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 queues | Mic Bowman | 2011-04-04 | 1 | -210/+82 |
| | | | | | | | | | |||||
| * | | | | | | | | Implements adaptive queue management and fair queueing for | Mic Bowman | 2011-04-04 | 2 | -120/+304 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improved networking performance. Reprioritization algorithms need to be ported still. One is in place. | ||||
* | | | | | | | | | Removed some priority queue debugging code | Mic Bowman | 2011-04-11 | 1 | -80/+0 |
| | | | | | | | | | |||||
* | | | | | | | | | Changed the "not in scene" check in the prioritizier to just | Mic Bowman | 2011-04-10 | 1 | -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. LLClientView | Mic Bowman | 2011-04-10 | 2 | -205/+245 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is big enough. | ||||
* | | | | | | | | | Fix a bug in the computation of the RTO. Basically... the RTO (the | Mic Bowman | 2011-04-10 | 1 | -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 queues | Mic Bowman | 2011-04-10 | 1 | -210/+82 |
| | | | | | | | | | |||||
* | | | | | | | | | Implements adaptive queue management and fair queueing for | Mic Bowman | 2011-04-10 | 2 | -120/+304 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improved networking performance. Reprioritization algorithms need to be ported still. One is in place. | ||||
* | | | | | | | | | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2011-04-09 | 1 | -4/+4 |
| | | | | | | | | |