aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-09-030-0/+0
|\
| * Revert "made setting rotation match Second Life"Melanie2012-09-031-1/+32
| * Revert "no need to assign rotation to a variable now"Melanie2012-09-031-1/+2
| * Revert "formatting"Melanie2012-09-031-2/+2
* | Merge branch 'master' into careminsterMelanie2012-09-031-44/+3
|\ \ | |/
| * formattingSignpostMarv2012-09-031-2/+2
| * no need to assign rotation to a variable nowSignpostMarv2012-09-031-2/+1
| * made setting rotation match Second LifeSignpostMarv2012-09-031-32/+1
* | Merge branch 'master' into careminsterMelanie2012-09-0218-6171/+962
|\ \ | |/
| * BulletSim: update the SOs and DLLsRobert Adams2012-08-314-0/+0
| * BulletSim: Update BulletSimAPI to match the DLL interface.Robert Adams2012-08-314-137/+231
| * BulletSim: clean up some variable naming for consistancy.Robert Adams2012-08-314-102/+183
| * BulletSim: fix line endings.Robert Adams2012-08-311-22/+22
| * BulletSim: Changes to terrain storage and management so mega-regions work.Robert Adams2012-08-318-185/+597
| * BulletSim: unify physical objects under BSPhysObjects. Now BSScene and BSLink...Robert Adams2012-08-315-160/+200
| * BulletSim: add new interface for mesh, hull and terrain creation that will mo...Robert Adams2012-08-311-7/+20
| * Remove the unused Newtonsoft.Json dllsMic Bowman2012-08-314-5850/+0
| * Fix Windows buildBlueWall2012-08-311-0/+1
* | Merge branch 'master' into careminsterMelanie2012-08-311-1/+1
|\ \ | |/
| * Type.Type is RuntimeTypeSignpostMarv2012-08-311-1/+1
* | Merge branch 'master' into careminsterMelanie2012-08-313-11/+68
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-311-1/+1
| |\
| | * Implementing a vastly simpler means of allowing region modules to access GetL...SignpostMarv2012-08-311-1/+1
| * | formattingSignpostMarv2012-08-311-5/+5
| * | adding support for static method script invocationsSignpostMarv2012-08-312-2/+24
| * | moving assignment to new line to make next commit easier to read in diffsSignpostMarv2012-08-311-1/+2
| * | using specific type instead of varSignpostMarv2012-08-311-1/+1
| * | formattingSignpostMarv2012-08-311-1/+1
| * | formattingSignpostMarv2012-08-311-2/+1
| * | adding support for finding static methodsSignpostMarv2012-08-311-3/+9
| * | assign binding flags to variableSignpostMarv2012-08-311-1/+3
| * | no need to assign result to GetMethodInfoFromTypeSignpostMarv2012-08-311-3/+1
| * | changing to use Type argument instead of objectSignpostMarv2012-08-311-3/+3
| * | moving code that will be common into private static methodSignpostMarv2012-08-311-1/+8
| * | adding documentation to script invokation methodsSignpostMarv2012-08-311-0/+22
| |/
* | Merge branch 'master' into careminsterMelanie2012-08-3116-290/+566
|\ \ | |/
| * Replace SendBannedUserList with Avination's version. Untested in core. Not ev...Melanie2012-08-311-25/+32
| * Also do other MySQL region settings related calls under m_dbLock, in common w...Justin Clark-Casey (justincc)2012-08-311-117/+130
| * Do Windlight storage and removal calls in MySQL under m_dbLock, as is done wi...Justin Clark-Casey (justincc)2012-08-311-102/+108
| * Make ReuseDynamicTextures an experimental config setting in [Textures]. Defa...Justin Clark-Casey (justincc)2012-08-302-1/+15
| * If the compile-time DynamicTextureModule.ReuseTextures flag is set, check met...Justin Clark-Casey (justincc)2012-08-301-43/+59
| * fixing bug where last element in list is ignoredSignpostMarv2012-08-301-1/+1
| * refactoring as the list funcs either skip invalid values or recall ToDoubleListSignpostMarv2012-08-301-12/+11
| * Renaming existing 'torture' tests to 'performance' tests instead, since this ...Justin Clark-Casey (justincc)2012-08-295-14/+14
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-295-2/+49
| |\
| | * This partially implements the LSL function to set the responseMic Bowman2012-08-295-2/+49
| * | Add VectorRenderModuleStressTests that contains a long running test that gene...Justin Clark-Casey (justincc)2012-08-293-1/+184
| |/
* | Merge branch 'avination' into careminsterMelanie2012-08-3117-221/+751
|\ \
| * \ Merge branch 'ubitwork' into avinationMelanie2012-08-303-35/+38
| |\ \
| | * \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-08-302-12/+128
| | |\ \