Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Minor Modification, switch /2 to 0.5f in ODEPrim.Velocity | teravus | 2012-10-02 | 1 | -4/+4 | |
| | | | | | ||||||
* | | | | | Merge branch 'avination' into careminster | Melanie | 2012-10-03 | 1 | -1/+12 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| * | | | | Fix a viewer crash issue | Melanie | 2012-10-03 | 1 | -1/+12 | |
| | |_|/ | |/| | | ||||||
| * | | | Attempt to fix Mantis #6311. Honor a destination folder if one is given | Melanie | 2012-10-02 | 1 | -0/+39 | |
| | | | | ||||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-10-03 | 18 | -308/+647 | |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||||
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-10-02 | 15 | -309/+598 | |
| |\ \ \ | ||||||
| | * | | | correcting typo | SignpostMarv | 2012-10-02 | 1 | -3/+3 | |
| | | | | | ||||||
| | * | | | taking into account the recent introduction of implicit operators | SignpostMarv | 2012-10-02 | 1 | -3/+1 | |
| | | | | | ||||||
| | * | | | added perms checking, duplicated functionality to methods that do not ↵ | SignpostMarv | 2012-10-02 | 3 | -6/+86 | |
| | | | | | | | | | | | | | | | | | | | | require perms and have higher threat level | |||||
| | * | | | fixing copypasta | SignpostMarv | 2012-10-02 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | implementing osDropAttachment & osDropAttachmentAt | SignpostMarv | 2012-10-02 | 5 | -3/+72 | |
| | | | | | ||||||
| | * | | | string format arguments in wrong order | SignpostMarv | 2012-10-02 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | BulletSim: Make parameter value defaults match what should be the default ↵ | Robert Adams | 2012-10-02 | 2 | -14/+14 | |
| | | | | | | | | | | | | | | | | | | | | and what is in OpenSimDefaults.ini. Comment and debug printout changes. | |||||
| | * | | | BulletSim: Add ForcePosition and ForceOrientation to BSPhysObject and to its ↵ | Robert Adams | 2012-10-02 | 3 | -5/+64 | |
| | | | | | | | | | | | | | | | | | | | | children of BSPrim and BSCharacter. | |||||
| | * | | | BulletSim: Fix problem where box shapes were not being rebuilt if the shape ↵ | Robert Adams | 2012-10-02 | 1 | -4/+6 | |
| | | | | | | | | | | | | | | | | | | | | type changed. | |||||
| | * | | | BulletSim: Fix linkset problem where delayed manipulations of child objects ↵ | Robert Adams | 2012-10-02 | 1 | -10/+8 | |
| | | | | | | | | | | | | | | | | | | | | was using the child shape address at call time rather than the one created at taint time. | |||||
| | * | | | BulletSim: call ForcePosition and ForceOrientation in BSDynamics so there is ↵ | Robert Adams | 2012-10-02 | 1 | -39/+57 | |
| | | | | | | | | | | | | | | | | | | | | no lag between what the vehicle code sees and what the physics engine is using. | |||||
| | * | | | Add Flush() method to LogWriter. Also correct line endings to Linux form. | Robert Adams | 2012-10-02 | 1 | -161/+170 | |
| | | | | | ||||||
| | * | | | BulletSim: fix the FloatOnWater code so avatars can normally go underwater. | Robert Adams | 2012-10-02 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | BulletSim: impliment FloatOnWater OS function. | Robert Adams | 2012-10-02 | 3 | -22/+104 | |
| | | | | | ||||||
| | * | | | Correct my name in CONTRIBUTORS.txt | Robert Adams | 2012-10-02 | 1 | -35/+16 | |
| | | | | | ||||||
| | * | | | BulletSim: remove warnings for unused variables. | Robert Adams | 2012-10-02 | 3 | -14/+7 | |
| | | | | | ||||||
| * | | | | Attempt to fix Mantis #6311. Honor a destination folder if one is given | Melanie | 2012-10-02 | 1 | -0/+39 | |
| |/ / / | ||||||
| * | | | Add money event routing to the script engine. | Melanie | 2012-10-02 | 1 | -0/+3 | |
| | | | | ||||||
| * | | | Send money() events to the clicked prim. Reverting a change I made over a ↵ | Melanie | 2012-10-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | year ago. | |||||
| * | | | Prevent the ExtraSettings code from crashing SQLite driven sims. | Melanie | 2012-10-02 | 1 | -0/+6 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-02 | 1 | -1/+1 | |
|\ \ \ | |/ / | ||||||
| * | | On more virtual method | Diva Canto | 2012-10-01 | 1 | -1/+1 | |
| | | | ||||||
| * | | Allow setting connection limits, part 2 | Melanie | 2012-09-30 | 1 | -1/+26 | |
| | | | ||||||
| * | | Allow setting max connections for an endpoint | Melanie | 2012-09-30 | 2 | -4/+4 | |
| | | | ||||||
| * | | Add using clause I missed | Melanie | 2012-09-30 | 1 | -0/+1 | |
| | | | ||||||
| * | | Allow up to 12 simultaneous connections to a given endpoint rather than 2 | Melanie | 2012-09-30 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-09-30 | 1 | -12/+1 | |
|\ \ \ | |/ / | ||||||
| * | | Revert "Added request.Proxy=null everywhere, as discussed in ↵ | Diva Canto | 2012-09-30 | 25 | -41/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef. | |||||
| * | | Added request.Proxy=null everywhere, as discussed in ↵ | Diva Canto | 2012-09-30 | 25 | -8/+41 | |
| | | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-09-30 | 19 | -1424/+2235 | |
| |\ \ | ||||||
| * | | | Made a method of GridUserService virtual so it can be overridden. | Diva Canto | 2012-09-30 | 1 | -12/+1 | |
| | | | | ||||||
* | | | | Merge branch 'avination' into careminster | Melanie | 2012-09-29 | 4 | -37/+140 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | Melanie | 2012-09-28 | 4 | -57/+147 | |
| |\ \ \ | ||||||
| | * | | | make some forgotten changes be done by simulation thread not by caller | UbitUmarov | 2012-09-27 | 2 | -34/+126 | |
| | | | | | ||||||
| | * | | | Update the Http server with a few additional properties. Adapt the test | Melanie | 2012-09-27 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | server code to match. | |||||
| * | | | | Fix a possible NRE | Melanie | 2012-09-28 | 1 | -3/+10 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-09-29 | 22 | -1427/+2232 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||||
| * | | | | Get rid of some unnecessary casts in RemoteAdminPlugin. | Justin Clark-Casey (justincc) | 2012-09-29 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This was stopping http://code.google.com/p/opensimtools/wiki/RemoteAdminPHPClass from working with some methods (e.g. create_user). However, this casting has been around for at least 2 years so I'm puzzled that it worked in the first place, though it probably is extremely old sample code. | |||||
| * | | | | Fix bug where debug http level 6 could not be specified. Also converts ↵ | Justin Clark-Casey (justincc) | 2012-09-29 | 2 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | newlines at this level to '\n' to enable them to be logged. | |||||
| * | | | | Fire EventManager.TriggerOnAttach (and hence LSL attach event) when an ↵ | Justin Clark-Casey (justincc) | 2012-09-29 | 2 | -14/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object is attached from the scene. Enables previously disabled regression test. Based on SingpostMarv's patch in http://opensimulator.org/mantis/view.php?id=6302 but I prefer a simpler approach that does not expose a resume scripts option right now. | |||||
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-09-29 | 13 | -1372/+2150 | |
| |\ \ \ \ | ||||||
| | * | | | | BulletSim: remember to release the physical body and shape when a prim is ↵ | Robert Adams | 2012-09-28 | 2 | -16/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | destroyed. This fixes many problems with physical linksets. | |||||
| | * | | | | BulletSim: add separate runtime and taint-time linkset children lists to ↵ | Robert Adams | 2012-09-27 | 3 | -80/+93 | |
| | | | | | | | | | | | | | | | | | | | | | | | | keep the creation of constraints separate from runtime. | |||||
| | * | | | | BulletSim: rename some constraint variables to be consistant with other name ↵ | Robert Adams | 2012-09-27 | 7 | -116/+231 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use. Added callbacks for shape and body changes in GetBodyAndShape() so the linkset constraints can be picked up and restored. A better design might be to have a "prim shape changed" event. Think about that. Added constraint types to general constraint class. |