aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-284-15/+34
|\
| * minor: Fix verbose IAR save message to make it a bit clearer that item data i...Justin Clark-Casey (justincc)2012-10-271-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-262-6/+8
| |\
| * | Fix "save iar" hanging permanently if the asset request phase times out.Justin Clark-Casey (justincc)2012-10-264-14/+33
* | | Merge branch 'master' into careminsterMelanie2012-10-263-6/+8
|\ \ \ | | |/ | |/|
| * | Separate LSL's notion of the default anim from the actually playing anims.Melanie2012-10-262-5/+7
| * | Revert "Fix for Mantis 0006376: Avatar no longer show Walking animation when ...Melanie2012-10-261-1/+1
| |/
* | Merge branch 'master' into careminsterMelanie2012-10-2647-448/+1116
|\ \ | |/
| * minor: Make the error thrown logged when a simulator in grid mode is trying t...Justin Clark-Casey (justincc)2012-10-261-1/+1
| * refactoring IWorldCommListenerInfo.GetRegexBitfield() method to be a field wi...SignpostMarv2012-10-262-14/+9
| * adding ability for listeners to be filtered by regular expressions and a gene...SignpostMarv2012-10-266-19/+242
| * Formatting and casing correction in WorldCommModule, trailing new line in OSS...SignpostMarv2012-10-263-5/+5
| * minor: Add comment as to why we are pulcking plain old ints out of the LSL_Li...Justin Clark-Casey (justincc)2012-10-261-0/+2
| * Removing the apparently superfluous explicit namespace reference so that the ...SignpostMarv2012-10-261-8/+2
| * system ints can end up in LSL lists, which can cause counter-intuitive unknow...SignpostMarv2012-10-261-0/+2
| * Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations sin...Justin Clark-Casey (justincc)2012-10-263-103/+106
| * Fixed saving non-square multi-region OARsOren Hurvitz2012-10-261-1/+1
| * minor: if a scene is already shutting down on Scene.Close(), warn and exit in...Justin Clark-Casey (justincc)2012-10-251-0/+6
| * Changed "course" to "coarse" in several placesOren Hurvitz2012-10-253-18/+18
| * Changed duplicate Asset ID's to unique ID's in CollisionSoundsAssetSet.xmlOren Hurvitz2012-10-251-6/+6
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-251-1/+1
| |\
| | * Fix for Mantis 0006376: Avatar no longer show Walking animation when any AO h...nebadon2012-10-251-1/+1
| * | In Scene.Close(), dispose of the physics scene after base.Close() since scrip...Justin Clark-Casey (justincc)2012-10-252-6/+25
| |/
| * Fix script error messages not showing up in viewer 3 and associated viewers.Justin Clark-Casey (justincc)2012-10-259-34/+75
| * Get osNpcCreate() and osNpcLoadAppearance() to generate a script error if app...Justin Clark-Casey (justincc)2012-10-252-11/+30
| * When scripts generate expected exceptions (e.g. due to checked bad parameter)...Justin Clark-Casey (justincc)2012-10-255-9/+52
| * Make osNpcCreate() return UUID.Zero instead of throwing an exception if notec...Justin Clark-Casey (justincc)2012-10-253-12/+74
| * Add TestOsNpcLoadAppearance()Justin Clark-Casey (justincc)2012-10-253-4/+48
| * Move npc creation tests involving appearance from OSSL_ApiAppearanceTest to O...Justin Clark-Casey (justincc)2012-10-252-70/+69
| * Allow "show object", "show part", "dump object" and "delete object" to accept...Justin Clark-Casey (justincc)2012-10-244-45/+153
| * Get "save oar" and "save iar" to tell you in a more friendly manner if the fi...Justin Clark-Casey (justincc)2012-10-246-11/+41
| * Add "dump object uuid" console command. This allows any object in the scene ...Justin Clark-Casey (justincc)2012-10-242-91/+168
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-2414-390/+534
| |\
| | * BulletSim: update binaries with small change that insures that manual positio...Robert Adams2012-10-234-0/+0
| | * BulletSim: fix problem with avatars sinking into the ground.Robert Adams2012-10-234-15/+23
| | * BulletSim: minor change to insure avatar body recreation when shape changes.Robert Adams2012-10-231-3/+3
| * | minor: Move co-ordinate related help to object commands to common ConsoleUtil...Justin Clark-Casey (justincc)2012-10-242-33/+20
* | | Merge branch 'master' into careminsterMelanie2012-10-2317-417/+767
|\ \ \ | | |/ | |/|
| * | BulletSim: remove chatty debug message.Robert Adams2012-10-222-2/+2
| * | BulletSim: fix bug that caused error (and a crash on 32 bit Linux) when mesh ...Robert Adams2012-10-228-35/+51
| * | BulletSim: fix problem of not rebuilding shape by clearing last rebuild faile...Robert Adams2012-10-222-2/+8
| * | BulletSim: remove trailing spaces to make git happy.Robert Adams2012-10-228-36/+36
| * | BulletSim: encorporate UBit's suggestion to save a copy of mesh raw data.Robert Adams2012-10-221-2/+1
| * | BulletSim: Create LinkSet abstract class and sparate constraint based linkset...Robert Adams2012-10-223-319/+434
| |/
| * Make it possible to turn the base UDP object packet pools on and off whilst r...Justin Clark-Casey (justincc)2012-10-233-51/+132
| * Add object count stats for new IncomingPacket and UDPPacketBuffer pools if th...Justin Clark-Casey (justincc)2012-10-236-14/+153
| * minor: Get content type handler logger to log "unset" for the content type in...Justin Clark-Casey (justincc)2012-10-231-1/+1
| * minor: Use LogIncomingToContentTypeHandler() method for incoming HTTP data wh...Justin Clark-Casey (justincc)2012-10-231-8/+2
* | Merge branch 'master' into careminsterMelanie2012-10-237-142/+407
|\ \ | |/
| * Refactor: Move Dwell reply to a module that can be disabled. The prior,Melanie2012-10-213-12/+111