aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | | | | This still returns true even if we ask to destroy a store that does not exist. Need to check that this is more appropriate behaviour.
| | * 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 ↵Justin Clark-Casey (justincc)2013-02-073-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (probably other functions as well). Fix is to call through to the no-arg constructor from the string constructor in JsonStore, which I suspect was just forgotten. This was actually picked up by the TestJsonSetValue() regression test failing But this isn't being run on jenkins due to the .net version issue. This commit also puts the full stack trace in logged messages and makes these error level messages instead of info
* | | | 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
| | |/ | |/| | | | | | | to work with the new params. Not actually plumbed just yet.
* | | 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 ↵teravus2013-01-291-12/+23
| | | | | | | | | | | | | | | | | | | | required.
* | | | | 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
| | | | | | | | | | | | | | | | | | | | This reverts commit c658fa1c0dd83f23c66ccfedb12e8ab02ff01d0a.
| * | | | Add plumbing for physics properties to get to the physics engine.Robert Adams2013-02-072-6/+55
| | | | | | | | | | | | | | | | | | | | Addition of entries to PhysicsActor and setting code in SceneObjectPart.
* | | | | Merge branch 'master' into careminsterMelanie2013-02-0712-2945/+4280
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: bin/HttpServer_OpenSim.dll
| * | | | 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 ↵teravus2013-02-07128-1214/+1475
| |\ \ \ \ | | | | | | | | | | | | | | | | | | allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
| * | | | | 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 ↵teravus2013-02-056-2905/+2946
| | | | | | | | | | | | | | | | | | | | | | | | working.. Still have to do Header.ToBytes and compose a websocket frame with a payload.
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | additional client stacks. Use comma separated values in clientstack_plugin in your config.
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | any race related test failures in the future.
* | | | | | | | Merge branch 'master' into careminsterMelanie2013-02-0710-28/+151
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | | | | | | 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 ↵Justin Clark-Casey (justincc)2013-02-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | match Add(string key, OSDMap store)
| | | * | | | | | BulletSim: set removing zero width triangles in meshes to be enabled by ↵Robert Adams2013-02-062-1/+2
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | default. This should fix the invisible barrier in sculptie doorways bug.
| | | * | | | | BulletSim: check for completely degenerate meshes (ones with allRobert Adams2013-02-061-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | triangles having zero width) and output an error rather than throwing and exception.
| | * | | | | | WebStats will now use actual logfile as specified in OpenSim.exe.config ↵Dan Lake2013-02-062-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than hardcoded ./OpenSim.log. This allows for rotating logs and other file appender types
| * | | | | | | Enables script access to the per object dynamic attributes through the JsonStoreMic Bowman2013-02-065-13/+104
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script functions. Adds JsonAttachObjectStore to associate a store identifier with an object (scripts can only access the store in their host object, this could be extended but isn't necessary for now). Note this opens a method to the DAMap OSDMap. This will be removed later, but greatly simplifies the code for now. The JsonStore and these scripts are disabled by default.
| * | | | | | BulletSim: remove an exception which occurs if a physics meshRobert Adams2013-02-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | asset is not found.
* | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | not always at 20m.
generated by cgit v1.1 at 2024-10-25 18:28:51 +0000