aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-07-2420-242/+437
|\
| * BulletSim: add position resetting for stationary avatars so they don'tRobert Adams2013-07-182-5/+20
| * Changed the timoeut of EQ 502s (no events) to 50 secs. The viewer post reques...Diva Canto2013-07-181-2/+9
| * try Hacking in an AutoResetEvent to control the outgoing UDP loop instead of ...Justin Clark-Casey (justincc)2013-07-182-2/+28
| * Reverting the reverts I did yesterday. cpu-branch has now beenDiva Canto2013-07-181-3/+5
| * Added MinPoolThreads to ini [Startup] section to control SmartThreadPool.Dan Lake2013-07-181-1/+3
| * 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-177-28/+98
| | |\
| | * | 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-171-5/+3
| | |/ | |/|
| * | 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-171-3/+5
| |/ /
| * | 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-163-11/+36
| * | 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
| * 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
| * High CPU hunt: try a different blocking queue, DoubleQueueDiva Canto2013-07-162-1/+3
| * revert last commit which seems to conflict with DoubleQueue internals. The ra...dahlia2013-07-161-10/+5
| * add locking to internal queue in WebFetchInvDescModule; lack of which caused ...dahlia2013-07-161-5/+10
| * Simplify EventQueue cap setup so that it is also stat monitored.Justin Clark-Casey (justincc)2013-07-161-45/+29
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-1512-95/+109
| |\
| | * Revert "Puts RequestImage (UDP) back to asyn -- CPU spike hunt"Diva Canto2013-07-151-1/+1
| | * Guard against null refDiva Canto2013-07-151-1/+2
| | * Puts RequestImage (UDP) back to asyn -- CPU spike huntDiva Canto2013-07-151-1/+1
| | * Revert the revertDiva Canto2013-07-151-0/+2
| | * Protect against null requestsDiva Canto2013-07-152-12/+16
| | * Trying to hunt the CPU spikes recently experienced.Diva Canto2013-07-151-2/+0
| * | Add request received/handling stats for caps which are served by http poll ha...Justin Clark-Casey (justincc)2013-07-155-69/+110
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-07-185-13/+8
|\ \ \
| * \ \ Merge branch 'master' into careminsterMelanie2013-07-133-26/+61
| |\ \ \ | | |/ /
| * | | Merge branch 'master' into careminsterMelanie2013-07-1357-828/+1732
| |\ \ \
* | \ \ \ Merge branch 'master' into careminsterMelanie2013-07-1865-936/+1848
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Cleanup old hg sessions (older than 2 days)Diva Canto2013-07-141-2/+5
| * | | Let's go easy on authenticating ChildAgentUpdates, otherwise this will be cha...Diva Canto2013-07-141-7/+5
| * | | Fix broken tests -- the test setup was wrong... sigh.Diva Canto2013-07-141-0/+1
| * | | Authenticate ChildAgentUpdate too.Diva Canto2013-07-142-16/+29
| * | | Change the auth token to be the user's sessionid.Diva Canto2013-07-143-6/+6
| * | | And this fixes the other failing tests. Justin, the thread pool is not being ...Diva Canto2013-07-131-2/+0
| * | | This should fix the failing test.Diva Canto2013-07-131-2/+1
| * | | Deleted a line too manyDiva Canto2013-07-131-0/+3
| * | | Guard against unauthorized agent deletes.Diva Canto2013-07-136-22/+42