aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Added show client-stats [first last] command to expose what viewers are reque...Diva Canto2013-07-101-3/+8
| * Add missing file BaseOutputStreamHandler.cs from recent commit e19defdJustin Clark-Casey (justincc)2013-07-081-0/+60
| * minor: remove now unused migration-hack bool from DAMapJustin Clark-Casey (justincc)2013-07-081-4/+0
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-081-1/+1
| |\
| | * BaseHttpServer: if the handler sets the content length, don't override it. Th...Diva Canto2013-07-081-1/+1
| * | Add "show caps stats by user" and "show caps stats by cap" console commands t...Justin Clark-Casey (justincc)2013-07-087-16/+51
| |/
| * Revert "WARNING: BRUTE FORCE DEBUG. AVOID USING THIS COMMIT."Diva Canto2013-07-041-4/+0
| * WARNING: BRUTE FORCE DEBUG. AVOID USING THIS COMMIT.Diva Canto2013-07-041-0/+4
* | Merge branch 'master' into careminsterMelanie2013-06-303-125/+192
|\ \ | |/
| * Changed HG status notifications timeout down to 15secs from the default 100.Diva Canto2013-06-291-1/+9
| * Remove hack to migrate previous experimental-level os materials data.Justin Clark-Casey (justincc)2013-06-291-9/+0
| * add method docs for DAMap.GetStore() and DAMap.SetStore()dahlia2013-06-271-0/+12
| * Make the concept of namespaces explicit in dynamic attributesJustin Clark-Casey (justincc)2013-06-272-126/+182
* | Merge branch 'master' into careminsterMelanie2013-06-2310-185/+635
|\ \ | |/
| * minor: remove mono compiler warnings in WebsocketServerHandler.csJustin Clark-Casey (justincc)2013-06-201-13/+7