aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-0318-308/+647
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-10-0215-309/+598
| |\
| | * correcting typoSignpostMarv2012-10-021-3/+3
| | * taking into account the recent introduction of implicit operatorsSignpostMarv2012-10-021-3/+1
| | * added perms checking, duplicated functionality to methods that do not require...SignpostMarv2012-10-023-6/+86
| | * fixing copypastaSignpostMarv2012-10-021-1/+1
| | * implementing osDropAttachment & osDropAttachmentAtSignpostMarv2012-10-025-3/+72
| | * string format arguments in wrong orderSignpostMarv2012-10-021-1/+1
| | * BulletSim: Make parameter value defaults match what should be the default and...Robert Adams2012-10-022-14/+14
| | * BulletSim: Add ForcePosition and ForceOrientation to BSPhysObject and to its ...Robert Adams2012-10-023-5/+64
| | * BulletSim: Fix problem where box shapes were not being rebuilt if the shape t...Robert Adams2012-10-021-4/+6
| | * BulletSim: Fix linkset problem where delayed manipulations of child objects w...Robert Adams2012-10-021-10/+8
| | * BulletSim: call ForcePosition and ForceOrientation in BSDynamics so there is ...Robert Adams2012-10-021-39/+57
| | * Add Flush() method to LogWriter. Also correct line endings to Linux form.Robert Adams2012-10-021-161/+170
| | * BulletSim: fix the FloatOnWater code so avatars can normally go underwater.Robert Adams2012-10-021-1/+1
| | * BulletSim: impliment FloatOnWater OS function.Robert Adams2012-10-023-22/+104
| | * Correct my name in CONTRIBUTORS.txtRobert Adams2012-10-021-35/+16
| | * BulletSim: remove warnings for unused variables.Robert Adams2012-10-023-14/+7
| * | Attempt to fix Mantis #6311. Honor a destination folder if one is givenMelanie2012-10-021-0/+39
| |/
| * Add money event routing to the script engine.Melanie2012-10-021-0/+3
| * Send money() events to the clicked prim. Reverting a change I made over a yea...Melanie2012-10-021-1/+1
| * Prevent the ExtraSettings code from crashing SQLite driven sims.Melanie2012-10-021-0/+6
* | Merge branch 'master' into careminsterMelanie2012-10-021-1/+1
|\ \ | |/
| * On more virtual methodDiva Canto2012-10-011-1/+1
| * Allow setting connection limits, part 2Melanie2012-09-301-1/+26
| * Allow setting max connections for an endpointMelanie2012-09-302-4/+4
| * Add using clause I missedMelanie2012-09-301-0/+1
| * Allow up to 12 simultaneous connections to a given endpoint rather than 2Melanie2012-09-301-0/+1
* | Merge branch 'master' into careminsterMelanie2012-09-301-12/+1
|\ \ | |/
| * Revert "Added request.Proxy=null everywhere, as discussed in http://stackover...Diva Canto2012-09-3025-41/+8
| * Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com...Diva Canto2012-09-3025-8/+41
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-3019-1424/+2235
| |\
| * | Made a method of GridUserService virtual so it can be overridden.Diva Canto2012-09-301-12/+1
* | | Merge branch 'avination' into careminsterMelanie2012-09-294-37/+140
|\ \ \
| * \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-09-284-57/+147
| |\ \ \
| | * | | make some forgotten changes be done by simulation thread not by callerUbitUmarov2012-09-272-34/+126
| | * | | Update the Http server with a few additional properties. Adapt the testMelanie2012-09-271-0/+4
| * | | | Fix a possible NREMelanie2012-09-281-3/+10
* | | | | Merge branch 'master' into careminsterMelanie2012-09-2922-1427/+2232
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Get rid of some unnecessary casts in RemoteAdminPlugin.Justin Clark-Casey (justincc)2012-09-291-5/+5
| * | | | Fix bug where debug http level 6 could not be specified. Also converts newli...Justin Clark-Casey (justincc)2012-09-292-5/+5
| * | | | Fire EventManager.TriggerOnAttach (and hence LSL attach event) when an object...Justin Clark-Casey (justincc)2012-09-292-14/+18
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-2913-1372/+2150
| |\ \ \ \
| | * | | | BulletSim: remember to release the physical body and shape when a prim is des...Robert Adams2012-09-282-16/+16
| | * | | | BulletSim: add separate runtime and taint-time linkset children lists to keep...Robert Adams2012-09-273-80/+93
| | * | | | BulletSim: rename some constraint variables to be consistant with other name ...Robert Adams2012-09-277-116/+231
| | * | | | BulletSim: remove the trailing spaces from lines to make git happierRobert Adams2012-09-2710-276/+275
| | * | | | BulletSim: remove the unused body management code from BSPrim. There is no go...Robert Adams2012-09-271-374/+0
| | * | | | BulletSim: Fix linkset crash. Caused by the different body and shapeRobert Adams2012-09-279-94/+182
| | * | | | BulletSim: Terrain sets proper collision flags on creation.Robert Adams2012-09-274-52/+56