aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-201-1/+1
| | |\ \
| | | * | BulletSim: change 'degenerate mesh' message from Error to Debug because thereRobert Adams2013-03-191-1/+1
| | * | | Prevent multiple instances of the same item ID being appended to an AvatarApp...Justin Clark-Casey (justincc)2013-03-193-34/+60
| | |/ /
| | * | For the moment, disable the output of the 'scene' statistics in SimExtraStats...Robert Adams2013-03-191-1/+3
| | * | For those people collecting and comparing logfiles from servers scatteredRobert Adams2013-03-191-1/+1
| | * | BulletSim: code to generate a higher resolution terrain mesh. ParameterRobert Adams2013-03-194-18/+189
| | * | BulletSim: add terrain contact processing threshold parameter. Initialize con...Robert Adams2013-03-194-1/+23
* | | | Fix SceneManager to use the new automatic property throughout.Melanie2013-03-211-3/+2
|/ / /
* | | Merge branch 'avination' into careminsterMelanie2013-03-192-12/+37
|\ \ \ | | |/ | |/|
| * | * Ignores VolumeDetect enabled prim in the camera raycast call. Note: The ...teravus2013-03-161-11/+36
| * | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avina...root2013-03-161-2/+2
| |\ \
| * | | Fix case where the string member of a LSL_String in a list is nullroot2013-03-161-1/+1
* | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-03-190-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-03-1729-8909/+157
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-03-150-0/+0
| |\ \ \ \ \
* | | | | | | Fix merge artefactsMelanie2013-03-192-6/+6
* | | | | | | Merge branch 'master' into careminsterMelanie2013-03-190-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Process default attachment point in AttachObjectInternal before we check whet...Justin Clark-Casey (justincc)2013-03-191-27/+27
| * | | | | | Fix tests for multiattachMelanie2013-03-182-6/+6
| * | | | | | Merge branch 'master' into newmultiattachMelanie2013-03-1888-9613/+2109
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattachMelanie2013-03-181-139/+167
| |\ \ \ \ \ \ \
| * | | | | | | | Limit each attachment point to 5 items as per specMelanie2013-03-181-3/+13
| * | | | | | | | Multiattach, part 2Melanie2013-03-181-3/+9
| * | | | | | | | Multiattach, part 1Melanie2013-03-187-39/+44
* | | | | | | | | Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminsterMelanie2013-03-192-143/+351
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Improve rejection of any attempt to reattach an object that is already attached.Justin Clark-Casey (justincc)2013-03-182-31/+194
| * | | | | | | | Fix recent regression where an item worn to an attachment point that was alre...Justin Clark-Casey (justincc)2013-03-182-89/+153
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-03-1729-8909/+157
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Make the LSL memory functions virtual so script engines can override them if ...Melanie2013-03-151-3/+3
* | | | | | | | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminsterMelanie2013-03-1929-8909/+157
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | BulletSim: add INI parameter for angular banking timescale fudge parameter.Robert Adams2013-03-162-7/+12
| * | | | | | BulletSim: Working Implementation of Angular Banking for Vehicles (Not SL Gra...Vegaslon2013-03-161-16/+17
| * | | | | | *Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a c...teravus2013-03-164-3/+135
| * | | | | | Finally remove the 'REST' ApplicationPlugins code which has been non-function...Justin Clark-Casey (justincc)2013-03-1523-8890/+0
| |/ / / / /
* | | | | | Merge branch 'master' into careminsterMelanie2013-03-1525-339/+474
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Change the table and field names of XAssetService mysql db tables to be capit...Justin Clark-Casey (justincc)2013-03-152-62/+60
| * | | | | Implement access time updates on assets for XAssetService.Justin Clark-Casey (justincc)2013-03-151-38/+57
| * | | | | refactor: Reuse Get() method in AssetService to eliminate some copy/paste in ...Justin Clark-Casey (justincc)2013-03-151-23/+5
| * | | | | Migrate assets from chained asset service to xassetservice as they are reques...Justin Clark-Casey (justincc)2013-03-151-28/+20
| * | | | | Fix bug in AssetService where requesting data only for an asset would throw a...Justin Clark-Casey (justincc)2013-03-151-1/+5
| * | | | | minor: log an error rather than info if a connector fails to load.Justin Clark-Casey (justincc)2013-03-151-1/+1
| * | | | | minor: Make logged message in ServerUtils more consistent.Justin Clark-Casey (justincc)2013-03-151-10/+10
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-154-35/+60
| |\ \ \ \ \
| | * | | | | Add Vegaslon to CONTRIBUTORS.txtRobert Adams2013-03-151-0/+1
| | * | | | | BulletSim: Tweak vertical angular attraction to remove double VehicleOrientat...Vegaslon2013-03-151-1/+1
| | * | | | | Fix server statistics always reporting zero for total network bytes in/out.Robert Adams2013-03-152-34/+58
| * | | | | | Make it possible to chain another asset service underneath the de-duplicating...Justin Clark-Casey (justincc)2013-03-153-23/+76
| |/ / / / /
| * | | | | Add example code to DOExampleModule to pull data from that previously saved b...Justin Clark-Casey (justincc)2013-03-152-5/+29
| * | | | | Add ParentGroup.HasGroupChanged = true setting to DAExampleModule as this is ...Justin Clark-Casey (justincc)2013-03-151-0/+2
| * | | | | refactor: make llGetLinkName() and llGetLinkKey() use a common GetLinkEntity(...Justin Clark-Casey (justincc)2013-03-151-84/+80