aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-079-44/+1376
|\
| * 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-07120-1141/+1466
| |\
| | * Rename "Bounciness" to "Restitution"Melanie2013-02-074-9/+9
| * | This is the final commit that enables the Websocket handlerteravus2013-02-072-2/+1095
| * | We're not really done here.. but we're getting there. Socket Read is work...teravus2013-02-053-4/+45
| * | Merge branch 'master' into JSONTCPClientteravus2013-02-036-28/+54
| |\ \
| * | | Adds the ability to load more then one IClientNetworkServer thereby allowing ...teravus2013-02-034-48/+77
| * | | Commit 1 in of this branch feature. This is one of many...teravus2013-02-035-0/+446
* | | | Rename Bounciness to RestitutionMelanie2013-02-076-12/+12
* | | | 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-0620-429/+431
| | |\ \ \ \ | | | |/ / /
| | | * | | 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
| * | | | 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-067-147/+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
* | | | | Merge branch 'master' into careminsterMelanie2013-02-0619-448/+371
|\ \ \ \ \ | |/ / / /
| * | | | Remove unused ScriptEngineLoader and ScriptEngineInterface in OpenSim.Region....Justin Clark-Casey (justincc)2013-02-063-168/+0
| * | | | Remove wrong code in ScriptUtils.GetAssetIdFromKeyOrItemName which would retu...Justin Clark-Casey (justincc)2013-02-061-15/+0
| * | | | Allow JsonReadNotecard() to accept the name of the notecard as well as the as...Justin Clark-Casey (justincc)2013-02-061-8/+18
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-0612-182/+228
| |\ \ \ \
| | * | | | BulletSim: make removing zero width triangles from meshes optionalRobert Adams2013-02-052-24/+33
| | |/ / /
| | * | | BulletSim: remove degenerate triangles from meshes. This fixes theRobert Adams2013-02-055-45/+59
| | * | | BulletSim: add debugging looking for doorway sculpty problemsRobert Adams2013-02-053-4/+33
| | * | | BulletSim: rework some parameter setting implementation moving functionality ...Robert Adams2013-02-055-158/+152
| | * | | BulletSim: correct angular vertical attraction to properly correct an upside ...Robert Adams2013-02-051-1/+1
| | * | | Changed protection of CreateDefaultAppearanceEntries to protected, so extensi...Diva Canto2013-02-051-1/+1
| * | | | refactor: Move functions that lookup asset ids from task inventory or pass th...Justin Clark-Casey (justincc)2013-02-062-89/+137
| |/ / /
| * | | * the root prim was being given an OffsetPosition in addition to setting the ...teravus2013-02-051-1/+1
* | | | Merge branch 'master' into careminsterMelanie2013-02-0582-84/+628
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-0581-82/+628
| |\ \ \
| | * | | Fix bug where viewers would not see the "Module command functions not enabled...Justin Clark-Casey (justincc)2013-02-051-2/+62
| | * | | Merge branch 'dynamic-attributes2'Justin Clark-Casey (justincc)2013-02-0511-10/+496
| | |\ \ \
| | | * | | Remove the accidental PrimShapes column that I added back to the SQLite regio...Justin Clark-Casey (justincc)2013-01-251-2/+1