aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-02-061-1/+2
| | | |\ \ \ \ \
| | | | * | | | | Add key length validation to DAMap.Add(KeyValuePair<string, OSDMap> kvp) to m...Justin Clark-Casey (justincc)2013-02-071-1/+2
| | | * | | | | | BulletSim: set removing zero width triangles in meshes to be enabled by defau...Robert Adams2013-02-062-1/+2
| | | |/ / / / /
| | | * | | | | BulletSim: check for completely degenerate meshes (ones with allRobert Adams2013-02-061-9/+19
| | * | | | | | WebStats will now use actual logfile as specified in OpenSim.exe.config rathe...Dan Lake2013-02-062-2/+16
| * | | | | | | Enables script access to the per object dynamic attributes through the JsonStoreMic Bowman2013-02-065-13/+104
| | |/ / / / / | |/| | | | |
| * | | | | | BulletSim: remove an exception which occurs if a physics meshRobert Adams2013-02-061-2/+4
* | | | | | | Merge branch 'master' into careminsterMelanie2013-02-070-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix a bug I brought in by manually editing a diff file. Terrain is if cource ...Melanie2013-02-061-1/+1
| * | | | | | Partial port of Avination's support for the new physics parameters.Melanie2013-02-067-21/+264
* | | | | | | Merge branch 'master' into careminsterMelanie2013-02-068-147/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | minor: Add explanation of MaptileStaticUUID setting in Regions.ini.exampleJustin Clark-Casey (justincc)2013-02-061-0/+4
| * | | | | | Remove long unused Scene.DumpAssetsToFile boolean.Justin Clark-Casey (justincc)2013-02-064-9/+3
| * | | | | | Remove very long unused IScriptHost and NullScriptHostJustin Clark-Casey (justincc)2013-02-063-138/+1