aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-0318-308/+647
|\ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-10-0215-309/+598
| |\
| | * correcting typoSignpostMarv2012-10-021-3/+3
| | |
| | * taking into account the recent introduction of implicit operatorsSignpostMarv2012-10-021-3/+1
| | |
| | * added perms checking, duplicated functionality to methods that do not ↵SignpostMarv2012-10-023-6/+86
| | | | | | | | | | | | require perms and have higher threat level
| | * fixing copypastaSignpostMarv2012-10-021-1/+1
| | |
| | * implementing osDropAttachment & osDropAttachmentAtSignpostMarv2012-10-025-3/+72
| | |
| | * string format arguments in wrong orderSignpostMarv2012-10-021-1/+1
| | |
| | * BulletSim: Make parameter value defaults match what should be the default ↵Robert Adams2012-10-022-14/+14
| | | | | | | | | | | | and what is in OpenSimDefaults.ini. Comment and debug printout changes.
| | * BulletSim: Add ForcePosition and ForceOrientation to BSPhysObject and to its ↵Robert Adams2012-10-023-5/+64
| | | | | | | | | | | | children of BSPrim and BSCharacter.
| | * BulletSim: Fix problem where box shapes were not being rebuilt if the shape ↵Robert Adams2012-10-021-4/+6
| | | | | | | | | | | | type changed.
| | * BulletSim: Fix linkset problem where delayed manipulations of child objects ↵Robert Adams2012-10-021-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 Adams2012-10-021-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 Adams2012-10-021-161/+170
| | |
| | * BulletSim: fix the FloatOnWater code so avatars can normally go underwater.Robert Adams2012-10-021-1/+1
| | |
| | * BulletSim: impliment FloatOnWater OS function.Robert Adams2012-10-023-22/+104
| | |
| | * Correct my name in CONTRIBUTORS.txtRobert Adams2012-10-021-35/+16
| | |
| | * BulletSim: remove warnings for unused variables.Robert Adams2012-10-023-14/+7
| | |
| * | Attempt to fix Mantis #6311. Honor a destination folder if one is givenMelanie2012-10-021-0/+39
| |/
| * Add money event routing to the script engine.Melanie2012-10-021-0/+3
| |
| * Send money() events to the clicked prim. Reverting a change I made over a ↵Melanie2012-10-021-1/+1
| | | | | | | | year ago.
| * Prevent the ExtraSettings code from crashing SQLite driven sims.Melanie2012-10-021-0/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-10-021-1/+1
|\ \ | |/
| * On more virtual methodDiva Canto2012-10-011-1/+1
| |
| * Allow setting connection limits, part 2Melanie2012-09-301-1/+26
| |
| * Allow setting max connections for an endpointMelanie2012-09-302-4/+4
| |
| * Add using clause I missedMelanie2012-09-301-0/+1
| |
| * Allow up to 12 simultaneous connections to a given endpoint rather than 2Melanie2012-09-301-0/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-09-301-12/+1
|\ \ | |/
| * Revert "Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-3025-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 Canto2012-09-3025-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/opensimDiva Canto2012-09-3019-1424/+2235
| |\
| * | Made a method of GridUserService virtual so it can be overridden.Diva Canto2012-09-301-12/+1
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-09-294-37/+140
|\ \ \
| * \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-09-284-57/+147
| |\ \ \
| | * | | make some forgotten changes be done by simulation thread not by callerUbitUmarov2012-09-272-34/+126
| | | | |
| | * | | Update the Http server with a few additional properties. Adapt the testMelanie2012-09-271-0/+4
| | | | | | | | | | | | | | | | | | | | server code to match.
| * | | | Fix a possible NREMelanie2012-09-281-3/+10
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-09-2922-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-291-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-292-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-292-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/opensimJustin Clark-Casey (justincc)2012-09-2913-1372/+2150
| |\ \ \ \
| | * | | | BulletSim: remember to release the physical body and shape when a prim is ↵Robert Adams2012-09-282-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | destroyed. This fixes many problems with physical linksets.
| | * | | | BulletSim: add separate runtime and taint-time linkset children lists to ↵Robert Adams2012-09-273-80/+93
| | | | | | | | | | | | | | | | | | | | | | | | keep the creation of constraints separate from runtime.
| | * | | | BulletSim: rename some constraint variables to be consistant with other name ↵Robert Adams2012-09-277-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.
| | * | | | BulletSim: remove the trailing spaces from lines to make git happierRobert Adams2012-09-2710-276/+275
| | | | | |
| | * | | | BulletSim: remove the unused body management code from BSPrim. There is no ↵Robert Adams2012-09-271-374/+0
| | | | | | | | | | | | | | | | | | | | | | | | going back now.
| | * | | | BulletSim: Fix linkset crash. Caused by the different body and shapeRobert Adams2012-09-279-94/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pointers at runtime and at taint-time. Now passes the body into the taint. Vehicles zero inertia when active to eliminate Bullet's contribution to vehicle motion.
| | * | | | BulletSim: Terrain sets proper collision flags on creation.Robert Adams2012-09-274-52/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Static objects are set to ISLAND_SLEEPING rather than DISABLE_SIMULATION. Might reconsider this and, alternatively, have dynamic objects force activation. Clean up use of DetailLog().
generated by cgit v1.1 at 2024-12-17 22:29:56 +0000