aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-09-1020-236/+394
|\
| * Remove commented codeMelanie2012-09-101-11/+0
| * Merge branch 'ubitwork' into avinationMelanie2012-09-102-12/+34
| |\
| | * add a extra httppool thread to compensate for webfetchinventoryUbitUmarov2012-09-101-1/+2
| | * webFetchInventory: change control event to simple flag, adjust lockingUbitUmarov2012-09-101-11/+32
| * | Reduce max concurrent endpoint connections from 50 to 6 (was 2 before)Melanie2012-09-091-1/+1
| * | Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IMMelanie2012-09-092-1/+4
| * | Merge branch 'ubitwork' into avinationMelanie2012-09-084-23/+93
| |\ \ | | |/
| | * llClientView: try to have only one thread per client processingUbitUmarov2012-09-081-4/+49
| | * One more redundante ParcelProprieties on loginUbitUmarov2012-09-071-0/+2
| | * stop sending duplicated parcelProprieties at loginUbitUmarov2012-09-071-18/+39
| | * remove fireandforget call to EnableChildAgents at end on CompleteMovement,UbitUmarov2012-09-071-1/+3
| * | Set the maximum number of concurrent connections to a service endpointMelanie2012-09-071-0/+2
| |/
| * Prevent double slashes, try #4UbitUmarov2012-09-061-1/+1
| * Prevent double slashes, try #3Melanie2012-09-061-0/+3
| * Revert "Change string concatenation to Path.Combine to eliminate extra slashes."Melanie2012-09-061-8/+6
| * Merge branch 'ubitwork' into avinationMelanie2012-09-061-6/+8
| |\
| | * Change string concatenation to Path.Combine to eliminate extra slashes.Melanie2012-09-061-6/+8
| | * Revert " remove extra '/' in assets url"Melanie2012-09-061-13/+6
| | * remove extra '/' in assets urlUbitUmarov2012-09-061-6/+13
| * | Make friend notifies and closing child agents async because both canMelanie2012-09-043-43/+48
| * | Merge branch 'ubitwork' into avinationMelanie2012-09-044-3/+19
| |\ \ | | |/
| | * bug fixUbitUmarov2012-09-041-4/+6
| | * a forgotten file plus minor changes. Imp and SL viewer seem to preserveUbitUmarov2012-09-043-3/+11
| | * let avatar keep flying in tps to same region. (still bad for otherUbitUmarov2012-09-041-0/+6
| * | Remove debug spamMelanie2012-09-041-6/+6
| * | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated intoMelanie2012-09-043-97/+113
| * | Prevent a nullref if SimStatsReporter tries to report on a sim where psysics areMelanie2012-09-031-14/+17
| |/
| * try to reduce potencial recursive lockingUbitUmarov2012-09-011-26/+51
| * Merge branch 'avination' into ubitworkUbitUmarov2012-08-313-7/+60
| |\
| * | move keyframemotion.copy from sop.copy to sog.copy, where there isUbitUmarov2012-08-303-4/+8
* | | Merge branch 'master' into careminsterMelanie2012-09-104-6/+8
|\ \ \
| * | | passing in the function name to MOD_Api.ConvertFromLSL for more user-friendly...SignpostMarv2012-09-101-4/+4
| * | | Adjust namespce of FlotsamCacheBlueWall2012-09-092-2/+1
| * | | Revert "Move addin information to CoreModulePlugin.addin.xml"BlueWall2012-09-093-3/+6
* | | | Merge branch 'master' into careminsterMelanie2012-09-0924-122/+632
|\ \ \ \ | |/ / /
| * | | implementing per-region configuration of limits on the number of prims one ca...SignpostMarv2012-09-095-1/+57
| * | | refactoring to allow Scene.GetLandData to accept Vector3 as an argument. Note...SignpostMarv2012-09-085-12/+22
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-0811-64/+528
| |\ \ \
| | * | | BulletSim: update the DLLs and SOsRobert Adams2012-09-074-0/+0
| | * | | BulletSim: Add Bullet body and shape to BSPhysObject and renameRobert Adams2012-09-076-62/+505
| | * | | BulletSim: Add some comments (gasp) and log messages.Robert Adams2012-09-074-4/+13
| | * | | BulletSim: PhysicsActorType() now returns the correct value rather than 'unkn...Robert Adams2012-09-072-2/+3
| | * | | BulletSim: Modify collision flag calls to return the current flags.Robert Adams2012-09-072-7/+18
| * | | | 4096 is used in various places as the maximum height of a region, refactoring...SignpostMarv2012-09-083-3/+4
| |/ / /
| * | | renaming to markdown fileSignpostMarv2012-09-082-1/+1
| * | | multi-paragraph list itemSignpostMarv2012-09-081-7/+6
| * | | headersSignpostMarv2012-09-081-4/+4
| * | | removing redundant header; this is the building.txt file for opensimSignpostMarv2012-09-081-2/+0
| * | | code blocksSignpostMarv2012-09-081-2/+2