23d5bafa7f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-10-03 00:24:33 +01:00
ca5c0814f4
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-10-02 23:02:53 +01:00
f1886c449c
Attempt to fix Mantis #6311 . Honor a destination folder if one is given
2012-10-02 23:02:01 +01:00
a1679517d3
correcting typo
2012-10-02 22:14:47 +01:00
f555febdb7
taking into account the recent introduction of implicit operators
2012-10-02 22:14:46 +01:00
ce7694c108
added perms checking, duplicated functionality to methods that do not require perms and have higher threat level
2012-10-02 22:14:46 +01:00
c677c04f10
fixing copypasta
2012-10-02 22:14:46 +01:00
35b7c80e0b
implementing osDropAttachment & osDropAttachmentAt
2012-10-02 22:14:46 +01:00
e81e19a3b4
string format arguments in wrong order
2012-10-02 22:11:40 +01:00
210f227fe6
BulletSim: Make parameter value defaults match what should be the default and what is in OpenSimDefaults.ini. Comment and debug printout changes.
2012-10-02 11:14:15 -07:00
ce47d0c454
BulletSim: Add ForcePosition and ForceOrientation to BSPhysObject and to its children of BSPrim and BSCharacter.
2012-10-02 11:14:09 -07:00
d8a786870b
BulletSim: Fix problem where box shapes were not being rebuilt if the shape type changed.
2012-10-02 11:14:03 -07:00
ce97ebdc88
BulletSim: Fix linkset problem where delayed manipulations of child objects was using the child shape address at call time rather than the one created at taint time.
2012-10-02 11:13:57 -07:00
b6b505163c
BulletSim: call ForcePosition and ForceOrientation in BSDynamics so there is no lag between what the vehicle code sees and what the physics engine is using.
2012-10-02 11:13:51 -07:00
1e5869dcf6
Add Flush() method to LogWriter. Also correct line endings to Linux form.
2012-10-02 11:13:45 -07:00
f2c78281ce
BulletSim: fix the FloatOnWater code so avatars can normally go underwater.
2012-10-02 11:13:39 -07:00
33617e09a1
BulletSim: impliment FloatOnWater OS function.
2012-10-02 11:13:32 -07:00
c1740a2903
Correct my name in CONTRIBUTORS.txt
2012-10-02 11:13:26 -07:00
5221f2421e
BulletSim: remove warnings for unused variables.
2012-10-02 11:13:20 -07:00
54ec8b197b
Add money event routing to the script engine.
2012-10-02 01:25:55 +01:00
14b659e550
Send money() events to the clicked prim. Reverting a change I made over a year ago.
2012-10-02 01:17:46 +01:00
402128bb53
Prevent the ExtraSettings code from crashing SQLite driven sims.
2012-10-02 00:51:38 +01:00
e40cc46712
Merge branch 'master' into careminster
2012-10-02 00:06:02 +01:00
21c83d6238
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2012-10-02 00:03:37 +01:00
0b9bf236dd
On more virtual method
2012-10-01 15:55:24 -07:00
503ce70f74
Allow setting connection limits, part 2
2012-09-30 16:31:23 +01:00
060d6fe8f4
Allow setting max connections for an endpoint
2012-09-30 16:30:16 +01:00
7cc89cdadc
Add using clause I missed
2012-09-30 15:57:49 +01:00
f8a4b61954
Allow up to 12 simultaneous connections to a given endpoint rather than 2
2012-09-30 15:49:51 +01:00
91a5c602e3
Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow ."
...
But the patch is here, in case anyone wants to try it.
This reverts commit 531edd51d8
2012-09-30 07:48:03 -07:00
b9a883f1ca
Merge branch 'master' into careminster
2012-09-30 15:46:43 +01:00
531edd51d8
Added request.Proxy=null everywhere, as discussed in 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
2012-09-30 07:22:55 -07:00
14a4b146bf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-30 06:52:19 -07:00
5b69872655
Made a method of GridUserService virtual so it can be overridden.
2012-09-30 06:51:49 -07:00
944b1ed237
Merge branch 'avination' into careminster
2012-09-29 21:47:08 +01:00
71dd55a1ce
Merge branch 'master' into careminster
...
Conflicts:
CONTRIBUTORS.txt
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
2012-09-29 19:21:07 +01:00
4e9509dafa
Get rid of some unnecessary casts in RemoteAdminPlugin.
...
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.
2012-09-29 02:57:28 +01:00
f457952755
Fix bug where debug http level 6 could not be specified. Also converts newlines at this level to '\n' to enable them to be logged.
2012-09-29 02:38:21 +01:00
818379ba14
Fire EventManager.TriggerOnAttach (and hence LSL attach event) when an 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.
2012-09-29 01:14:23 +01:00
fae869c4ca
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-29 00:09:12 +01:00
d588467d5b
Extend attachment regression test to check for appropriate attach event firing.
...
This reveals that the event is not being fired when an object is attached from ground, which is incorrect.
This check is temporairly disabled.
2012-09-29 00:07:11 +01:00
e3d6d36c72
testing for xml-rpc errors in git repo.
2012-09-28 13:00:08 -07:00
7f96bb601a
BulletSim: update SOs and DLLs
2012-09-28 12:51:47 -07:00
76e9cc41bd
BulletSim: remember to release the physical body and shape when a prim is destroyed. This fixes many problems with physical linksets.
2012-09-28 12:34:50 -07:00
6f89975526
BulletSim: add separate runtime and taint-time linkset children lists to keep the creation of constraints separate from runtime.
2012-09-27 22:02:13 -07:00
74dea4cfd5
BulletSim: rename some constraint variables to be consistant with other name 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.
2012-09-27 22:02:08 -07:00
7b65985047
BulletSim: remove the trailing spaces from lines to make git happier
2012-09-27 22:02:03 -07:00
5781d4d52d
BulletSim: remove the unused body management code from BSPrim. There is no going back now.
2012-09-27 22:01:57 -07:00
f82b903dee
BulletSim: Fix linkset crash. Caused by the different body and shape
...
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.
2012-09-27 22:01:52 -07:00
4589bc84a3
BulletSim: Terrain sets proper collision flags on creation.
...
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().
2012-09-27 22:01:47 -07:00
Melanie