aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-081-10/+98
|\
| * Stop wrongly create a receiving store already populated with "Hello":"World" ...Justin Clark-Casey (justincc)2013-02-081-1/+3
| * Extend TestJsonWriteNotecard() regression test for cases with fake paths and ...Justin Clark-Casey (justincc)2013-02-081-8/+61
| * Extend TestJsonSetValue() regressio ntes tto test against a fake storeJustin Clark-Casey (justincc)2013-02-081-0/+5
| * Extend TestJsonTestPath() regression test with checks against fake values and...Justin Clark-Casey (justincc)2013-02-081-0/+8
| * Add tests for removing fake values/from fake store in TestJsonRemoveValue()Justin Clark-Casey (justincc)2013-02-071-0/+11
| * Add testing for getting non-existing values and values from a non-existing da...Justin Clark-Casey (justincc)2013-02-071-1/+10
* | Merge branch 'master' into careminsterMelanie2013-02-071-0/+20
|\ \ | |/
| * Actually plumb the new values to physics.Melanie2013-02-071-0/+20
* | Merge branch 'master' into careminsterMelanie2013-02-073-15/+29
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-073-15/+29
| |\
| | * Add TestJsonDestoreStoreNotExists()Justin Clark-Casey (justincc)2013-02-071-0/+14
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-0734-2976/+4555
| | |\
| | * | Fix a recent regression in e17392a where JsonSetValue() stopped working (prob...Justin Clark-Casey (justincc)2013-02-073-15/+15
* | | | Merge branch 'master' into careminsterMelanie2013-02-070-0/+0
|\ \ \ \ | |/ / /
| * | | Add some more code from Avination. This changes physics actor stuff aroundMelanie2013-02-073-40/+165
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2013-02-070-0/+0
|\ \ \ | |/ /
| * | Plumb the path from the client to the extra physics params and backMelanie2013-02-0710-7/+127
| * | Send the new physics params to the viewer build dialogMelanie2013-02-071-0/+35
* | | Merge branch 'avination' into careminsterMelanie2013-02-079-136/+222
|\ \ \
| * | | Rename Bounciness to RestitutionMelanie2013-02-076-12/+12
| * | | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-067-117/+190
| * | | Make scripts shout a error but not stop when button count is overrun on llDialogMelanie2013-02-051-7/+9
| * | | Merge branch 'teravuswork' into avinationMelanie2013-01-311-12/+23
| |\ \ \
| | * | | * This Checks the asset of each wearable asynchronously and repairs if it's r...teravus2013-01-291-12/+23
* | | | | Merge branch 'master' into careminsterMelanie2013-02-070-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Revert "Add plumbing for physics properties to get to the physics engine."Melanie2013-02-072-55/+6
| * | | | Add plumbing for physics properties to get to the physics engine.Robert Adams2013-02-072-6/+55
* | | | | Merge branch 'master' into careminsterMelanie2013-02-0712-2945/+4280
|\ \ \ \ \ | |/ / / /
| * | | | Change passed PhysicsParameter value from float to the more general string valueRobert Adams2013-02-074-43/+57
| * | | | Websocket Echo module should not be on by default.teravus2013-02-071-1/+1
| * | | | * missing example module.. Oops.teravus2013-02-071-0/+174
| * | | | * Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows...teravus2013-02-07128-1214/+1475
| |\ \ \ \
| * | | | | This is the final commit that enables the Websocket handlerteravus2013-02-074-2/+1095
| * | | | | We're not really done here.. but we're getting there. Socket Read is work...teravus2013-02-056-2905/+2946
| * | | | | Merge branch 'master' into JSONTCPClientteravus2013-02-038-31/+72
| |\ \ \ \ \
| * | | | | | Changing OpenSimDefaults back to defaultteravus2013-02-031-1/+1
| * | | | | | Adds the ability to load more then one IClientNetworkServer thereby allowing ...teravus2013-02-035-49/+78
| * | | | | | Commit 1 in of this branch feature. This is one of many...teravus2013-02-036-0/+491
* | | | | | | Rename Bounciness to RestitutionMelanie2013-02-076-12/+12
* | | | | | | Merge branch 'master' into careminsterMelanie2013-02-070-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Rename "Bounciness" to "Restitution"Melanie2013-02-074-9/+9
* | | | | | | Merge branch 'master' into careminsterMelanie2013-02-072-2/+61
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-077-15/+120
| |\ \ \ \ \ \
| * | | | | | | Add TestJsonWriteReadNotecard() regression testJustin Clark-Casey (justincc)2013-02-072-2/+45
| * | | | | | | Make json store tests operate on a single thread to ensure we don't run into ...Justin Clark-Casey (justincc)2013-02-071-0/+16
* | | | | | | | Merge branch 'master' into careminsterMelanie2013-02-0710-28/+151
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-02-066-13/+43
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-02-0623-429/+435
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | minor: add method doc to DAMap.ValidateKey()Justin Clark-Casey (justincc)2013-02-071-0/+4