aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-07-292-0/+23
|\
| * Several major improvements to group (V2) chat. Specifically: handle join/drop...Diva Canto2013-07-271-0/+18
| * Increased the rate of the PollServiceRequestManager to 0.5 secs (it was 1sec)...Diva Canto2013-07-261-1/+1
| * Fix regression tests relating to agent transfer by making simulator use last ...Justin Clark-Casey (justincc)2013-07-261-0/+5
* | Merge branch 'master' into careminsterMelanie2013-07-251-5/+6
|\ \ | |/
| * New Teleport protocol (V2), still compatible with V1 and older. (version of t...Diva Canto2013-07-241-5/+6
* | Merge branch 'master' into careminsterMelanie2013-07-242-3/+25
|\ \ | |/
| * Correct issue where the last instance of a sampled stat was shown 3x larger t...Justin Clark-Casey (justincc)2013-07-231-1/+2
| * Improve spacing between data and units on console stats displayJustin Clark-Casey (justincc)2013-07-231-3/+12
| * For stats which can show average change over time, show the last sample as we...Justin Clark-Casey (justincc)2013-07-231-1/+11
| * EDIT BEAMS!!! They had been missing from OpenSim since ever. Thanks to lkalif...Diva Canto2013-07-211-1/+1
| * Manage AgentUpdates more sanely:Diva Canto2013-07-211-0/+2
| * Removed verbose debug from previous commitDiva Canto2013-07-211-1/+0
| * PollServiceRequestManager: changed the long poll from a Queue to a List. No n...Diva Canto2013-07-211-13/+17
| * Delay the enqueueing of non-longpoll requests for 100ms. No need to have thes...Diva Canto2013-07-211-1/+11
* | Merge branch 'master' into careminsterMelanie2013-07-247-17/+102
|\ \ | |/
| * Changed the timoeut of EQ 502s (no events) to 50 secs. The viewer post reques...Diva Canto2013-07-181-1/+1
| * Revert "Revert "I confuse myself. Let's try this variable name instead.""Diva Canto2013-07-181-3/+3
| * Revert "Revert "Do the same trick that dahlia did for Dequeue(timeout)""Diva Canto2013-07-181-2/+3
| * Revert "Revert "Putting the requests back in the queue while testing for coun...Diva Canto2013-07-181-3/+7
| * Revert "Revert "Didn't mean to commit this change in BlockingQueue.cs""Diva Canto2013-07-181-1/+1
| * Reverting the reverts I did yesterday. cpu-branch has now beenDiva Canto2013-07-183-49/+36
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-07-181-1/+1
| |\
| | * Fix what apepars to be a bug in DoubleQueue<T>.Enqueue(Queue<T> q, T data) wh...Justin Clark-Casey (justincc)2013-07-181-1/+1
| * | Added MinPoolThreads to ini [Startup] section to control SmartThreadPool.Dan Lake2013-07-181-3/+5
| |/
| * Revert "Cleared up much confusion in PollServiceRequestManager. Here's the hi...Diva Canto2013-07-173-36/+49
| * Revert "Didn't mean to commit this change in BlockingQueue.cs"Diva Canto2013-07-171-1/+1
| * Revert "Putting the requests back in the queue while testing for count >0 is ...Diva Canto2013-07-171-7/+3
| * Revert "Do the same trick that dahlia did for Dequeue(timeout)"Diva Canto2013-07-171-3/+2
| * Revert "I confuse myself. Let's try this variable name instead."Diva Canto2013-07-171-3/+3
| * Revert "Now trying DoubleQueue instead of BlockingQueue for the PollServiceRe...Diva Canto2013-07-171-2/+2
| * Revert "This is a completely unreasonable thing to do, effectively defying th...Diva Canto2013-07-171-52/+40
| * This is a completely unreasonable thing to do, effectively defying the purpos...Diva Canto2013-07-171-40/+52
| * Now trying DoubleQueue instead of BlockingQueue for the PollServiceRequestMan...Diva Canto2013-07-171-2/+2
| * I confuse myself. Let's try this variable name instead.Diva Canto2013-07-171-3/+3
| * Do the same trick that dahlia did for Dequeue(timeout)Diva Canto2013-07-171-2/+3
| * Putting the requests back in the queue while testing for count >0 is not the ...Diva Canto2013-07-171-3/+7
| * Didn't mean to commit this change in BlockingQueue.csDiva Canto2013-07-171-1/+1
| * Cleared up much confusion in PollServiceRequestManager. Here's the history:Diva Canto2013-07-173-49/+36
| * minor: Add warning method doc about possibly inconsistent results returned fr...Justin Clark-Casey (justincc)2013-07-161-1/+19
| * Revert "Revert "MSDN documentation is unclear about whether exiting a lock() ...Justin Clark-Casey (justincc)2013-07-161-5/+8
| * Revert "MSDN documentation is unclear about whether exiting a lock() block wi...Justin Clark-Casey (justincc)2013-07-161-8/+5
| * MSDN documentation is unclear about whether exiting a lock() block will trigg...dahlia2013-07-161-5/+8
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-153-3/+4
| |\
| | * This might address the following observed exception:Diva Canto2013-07-151-1/+1
| * | Add request received/handling stats for caps which are served by http poll ha...Justin Clark-Casey (justincc)2013-07-155-51/+70
* | | Merge branch 'master' into careminsterMelanie2013-07-1817-27/+217
|\ \ \ | | |/ | |/|
| * | Authenticate ChildAgentUpdate too.Diva Canto2013-07-142-2/+3
| |/
| * Add ToOSDMap() overrides to the Stat subclass CounterStat.Robert Adams2013-07-123-0/+88
| * Fix regression where llHTTPRequests which did not get an OK response returned...Justin Clark-Casey (justincc)2013-07-111-1/+6