aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-07-185-13/+8
|\
| * Merge branch 'master' into careminsterMelanie2013-07-138-35/+189
| |\
| * \ Merge branch 'master' into careminsterMelanie2013-07-13104-921/+2034
| |\ \
* | \ \ Merge branch 'master' into careminsterMelanie2013-07-18131-1283/+2851
|\ \ \ \ | |/ / / |/| | |
| * | | Added SQLite version of hg travel data store. UNTESTED. Hope it works!Diva Canto2013-07-142-0/+100
| * | | Cleanup old hg sessions (older than 2 days)Diva Canto2013-07-145-2/+20
| * | | HG UAS: Moved hg-session data from memory to DB storage. This makes it so tha...Diva Canto2013-07-145-90/+344
| * | | Minor typo in log messageDiva Canto2013-07-141-1/+1
| * | | 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-142-1/+2
| * | | Authenticate ChildAgentUpdate too.Diva Canto2013-07-144-18/+32
| * | | Change the auth token to be the user's sessionid.Diva Canto2013-07-144-7/+10
| * | | 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-139-32/+57
| * | | Deleted GET agent all around. Not used.Diva Canto2013-07-135-134/+2
| * | | Gatekeeper: stop bogus agents earlier, here at the Gatekeeper. No need to bot...Diva Canto2013-07-131-0/+6
| * | | Some more debug to see how many threads are available.Diva Canto2013-07-131-0/+2
| * | | That didn't fix the problem.Diva Canto2013-07-132-27/+38
| * | | Trying to reduce CPU usage on logins and TPs: trying radical elimination of a...Diva Canto2013-07-132-38/+27
| * | | This commit effectively reverses the previous one, but it's just to log that ...Diva Canto2013-07-131-4/+4
| * | | Same issue as previous commit.Diva Canto2013-07-131-3/+4
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-135-10/+121
| |\ \ \ | | | |/ | | |/|
| | * | Reinsert PhysicsActor variable back into SOP.SubscribeForCollisionEvents() in...Justin Clark-Casey (justincc)2013-07-131-8/+12
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-135-10/+134
| | |\ \
| | | * | Add ToOSDMap() overrides to the Stat subclass CounterStat.Robert Adams2013-07-123-0/+88
| | * | | In co-op termination, extend EventWaitHandle to give this an indefinite lifet...Justin Clark-Casey (justincc)2013-07-131-2/+21
| * | | | Moved SendInitialDataToMe to earlier in CompleteMovement. Moved TriggerOnMake...Diva Canto2013-07-132-6/+15
| * | | | Added UploadBakedTexture/UploadBakedTextureServerConnector, so that this can ...Diva Canto2013-07-131-0/+76
| | |/ / | |/| |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-127-106/+312
| |\ \ \ | | |/ /
| | * | Enhance NullEstateData to remember stored estate values and returnRobert Adams2013-07-111-7/+21
| | |/
| | * Centralize duplicated code in SceneObjectPart for subscribing toRobert Adams2013-07-111-54/+43
| | * Try naming the materials handlers again, this time registering the POST as Re...Justin Clark-Casey (justincc)2013-07-111-3/+6
| | * minor: remove some regression test logging switches accidentally left uncomme...Justin Clark-Casey (justincc)2013-07-112-2/+2
| | * minor: Take out unnecessary clumsy sleep at the end of regression Test404Resp...Justin Clark-Casey (justincc)2013-07-111-3/+0
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-113-7/+109
| | |\
| | * | Fix regression where llHTTPRequests which did not get an OK response returned...Justin Clark-Casey (justincc)2013-07-113-41/+244
| * | | Changed UploadBakedTextureModule so that it uses the same pattern as the othe...Diva Canto2013-07-121-8/+27
| * | | Added a few more thingies to the asset client test to poke the threadpool.Diva Canto2013-07-111-2/+19
| | |/ | |/|
| * | Added property to make for more flexible testing.Diva Canto2013-07-111-0/+5
| * | Added a test for the asset serviceDiva Canto2013-07-111-0/+99
| * | Changed the UserProfileModule so that it's less greedy in terms of thread usage.Diva Canto2013-07-111-7/+5
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-111-7/+4
| |\
| | * remove names from Capability handlers (added by justincc in commit 013710168b...dahlia2013-07-101-7/+4
| * | Switched UUIDNameRequest and RegionHandleRequest to Sync, because now they ar...Diva Canto2013-07-111-2/+2
| * | Switched TransferRequest (UDP packet handler) to sync. The permissions checks...Diva Canto2013-07-111-99/+115
| |/
| * Switched RegionHandshakeReply to Sync, because it's not doing anything blocking.Diva Canto2013-07-101-1/+1
| * EXPERIMENTAL: make RequestImage (UDP packet handler) sync instead of async. T...Diva Canto2013-07-101-1/+1
| * show client stats: Fixed the requests/min. Also changed the spelling of the c...Diva Canto2013-07-101-21/+22