aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-07-2431-278/+657
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-192-5/+20
| |\
| | * BulletSim: add position resetting for stationary avatars so they don'tRobert Adams2013-07-182-5/+20
| * | Fix HGTravelStore.migrations in SQLite (mantis #6709)Diva Canto2013-07-191-10/+10
| |/
| * Enable storing of environment settings in NullSimulationDataDan Lake2013-07-181-3/+17
| * Changed the timoeut of EQ 502s (no events) to 50 secs. The viewer post reques...Diva Canto2013-07-182-3/+10
| * try Hacking in an AutoResetEvent to control the outgoing UDP loop instead of ...Justin Clark-Casey (justincc)2013-07-182-2/+28
| * 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-184-52/+41
| * 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-182-4/+8
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-171-2/+3
| |\
| | * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-07-1711-114/+192
| | |\
| | * | command line kick user now uses exact name match instead of substring search ...Dan Lake2013-07-171-2/+3
| * | | Revert "Cleared up much confusion in PollServiceRequestManager. Here's the hi...Diva Canto2013-07-174-41/+52
| * | | 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
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-172-6/+10
| |\ \
| | * | BulletSim: fix small bug where everything looked like it was collidingRobert Adams2013-07-172-6/+10
| * | | Cleared up much confusion in PollServiceRequestManager. Here's the history:Diva Canto2013-07-174-52/+41
| |/ /
| * | Removed the MapItems thread. Redirected the map items requests to the service...Diva Canto2013-07-162-9/+45
| * | Improvements to the ServiceThrottleModule: added a category and an itemid to ...Diva Canto2013-07-164-11/+40
| * | UserManagementModule: in the continuation, call the method that also looks up...Diva Canto2013-07-161-2/+2
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-163-6/+12
| |\ \ | | |/
| | * Attachments module only registers when enabled. This enables alternative atta...Dan Lake2013-07-163-6/+12
| * | Added config var to fiddle with the Interval for the service throttle threadDiva Canto2013-07-161-1/+4
| |/
| * Deleted a couple of verbose messagesDiva Canto2013-07-162-4/+2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-161-1/+19
| |\
| | * 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
| * | Added IServiceThrottleModule.csDiva Canto2013-07-161-0/+11
| * | Changed the name to ServiceThrottle/ServiceThrottleModule in order to reflect...Diva Canto2013-07-161-0/+0
| * | Eliminated the UserManagement/UserManagementModule throttle thread. Made the ...Diva Canto2013-07-162-189/+148
| |/
| * In the pursuit of using less CPU: now trying to avoid blocking queues altoget...Diva Canto2013-07-162-15/+120
| * Actually use DoubleQueue in UserManagement/UserManagementModuleDiva Canto2013-07-161-1/+1