Dan Lake
0247d738e2
When loading objects from DB, first add to scene, then call TriggerOnSceneObjectLoaded.
2012-03-27 12:50:58 -07:00
Melanie
a619621c60
Merge branch 'master' into careminster
2012-03-27 20:03:41 +01:00
Diva Canto
de242a29ca
HG: beginning of a more restrictive inventory access procedure (optional). Experimental: we'll try switching the root folder from under the viewer.
2012-03-27 11:54:13 -07:00
Melanie
6b5f3b49e7
Merge branch 'master' into careminster
2012-03-27 18:11:05 +01:00
Diva Canto
2e2634896d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 10:09:08 -07:00
Diva Canto
8131a24cde
Send the config section name up to the service classes themselves (XInventory and Assets).
2012-03-27 10:08:13 -07:00
UbitUmarov
9efabe5e1e
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-27 12:07:52 +01:00
Justin Clark-Casey (justincc)
b78224176e
Add Garmin Kawaguichi to CONTRIBUTORS.txt
2012-03-27 02:10:39 +01:00
Justin Clark-Casey (justincc)
09c85a6a6c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 02:10:02 +01:00
Garmin Kawaguichi
1aa1a9eb3d
In TerrainModule.cs, the command terrain save-tile is modified to remove an unnecessary double argument "minimum Y tile"
2012-03-27 02:05:57 +01:00
Melanie
0964af41be
Replace HG linker with core version
2012-03-27 01:46:02 +01:00
Robert Adams
872d513daa
BulletSim: make avatar animations update properly.
...
It seems that ODE calls the avatar collision handling routine even
if there are no collisions. This causes the animation to be updated.
So, for instance, going from HOVER to FLY is caused by the physics engine
calling the collision routine each frame with 0 collisions.
2012-03-26 17:36:33 -07:00
UbitUmarov
caeaa03a69
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-26 23:04:07 +01:00
Robert Adams
84c9bd52d3
BulletSim: update BulletSim binaries and configuration fixing a crash which happens when there are more than a few hundred physical objects.
2012-03-26 13:48:15 -07:00
Melanie
0bd0514e81
Merge branch 'master' into careminster
2012-03-26 16:47:02 +01:00
Melanie
ad865ab4fc
Add some more overloads to allow registering overloaded methods and lists
...
of methods.
2012-03-26 16:46:07 +01:00
Robert Adams
2fcdecf090
BulletSim: fix typo introducted by previous checkins (git merge sometimes makes mistakes)
2012-03-26 08:57:40 -07:00
Robert Adams
f8879e06d2
Merge branch 'bulletsim1'
2012-03-26 08:49:12 -07:00
Robert Adams
3691e39178
BulletSim: update BulletSim.dll and libBulletSim.so with latest versions
2012-03-26 08:48:51 -07:00
Melanie
da9743d1d7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 14:22:49 +01:00
Melanie
3810e98474
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 14:21:15 +01:00
Melanie
7e0936e4b6
Add a hust UUID to the script invocations
2012-03-26 14:19:55 +01:00
Mic Bowman
055269805d
Fix compile error in ScriptModuelComms and add some debugging into the modInvoke
...
routines to simplify finding method registration issues.
2012-03-25 22:59:06 -07:00
Melanie
98a6c78943
Fix the omission on the interface declaration
2012-03-26 03:33:39 +01:00
Melanie
5f1f956d17
Fix the omission on the interface declaration
2012-03-26 03:32:30 +01:00
Melanie
2c42dafe56
Fix Typo
2012-03-26 03:26:02 +01:00
Melanie
e05c72d32f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 03:22:26 +01:00
Melanie
c9c01d5226
Further simplify ScriptComms
2012-03-26 03:20:40 +01:00
Melanie
ac0f1ff0a6
Dynamically create the delegate type to reduce complexity in the caller
2012-03-26 01:47:20 +01:00
Melanie
d7cc194e83
Correct the design error I introduced into ScriptComms. Untested but about to
...
be.
2012-03-26 01:47:14 +01:00
Melanie
5e8d64c943
Dynamically create the delegate type to reduce complexity in the caller
2012-03-26 01:21:44 +01:00
Melanie
4b76c52c41
Correct the design error I introduced into ScriptComms. Untested but about to
...
be.
2012-03-26 00:30:52 +01:00
Melanie
44f1f87656
Merge branch 'master' into careminster
2012-03-25 20:07:43 +01:00
Melanie
cb44808504
Simplify the module invocation registration. The types and method name
...
can be pulled fromt he delegate so we don't need to pass them explicitly
2012-03-25 19:52:38 +01:00
Mic Bowman
a07fa0395f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-24 22:45:17 -07:00
Mic Bowman
a14437ad5a
Add support for key, vector, rotation and list types for both
...
arguments and return values to the modInvoke family of functions.
See http://opensimulator.org/wiki/OSSL_Script_Library/ModInvoke
2012-03-24 22:43:42 -07:00
UbitUmarov
88d5cb6eef
UbitOde let caller try to build meshs like done in chode. Changing this was a bad move i made. Variable colisions softness.
2012-03-24 16:04:13 +00:00
UbitUmarov
21a97408d4
Avatars have no bounce
2012-03-24 11:30:29 +00:00
Justin Clark-Casey (justincc)
4f17537555
Allow the user to enter help topics in upper or lowercase.
...
Forcing uppercase (e.g. help Assets) is too annoying.
Thanks to WhiteStar for pointing this out.
2012-03-24 03:07:01 +00:00
Justin Clark-Casey (justincc)
f03c3c062e
Hack example on to "terrain save-tile" extended help.
...
Thanks to Garmin Kawaguichi for the initially suggested text.
2012-03-24 02:41:45 +00:00
Justin Clark-Casey (justincc)
f53c6b2594
Use system provided temporary file in "terrain save-tile" to avoid problems with drive letters on windows
...
Thanks to Garmin Kawaguichi for picking up on this and providing an initial solution (which I adapted).
2012-03-24 02:30:43 +00:00
Justin Clark-Casey (justincc)
cf61c74e90
Give feedback when "terrain save-tile" is not successfully invoked.
2012-03-24 02:16:44 +00:00
Robert Adams
07388071d4
Merge branch 'bulletsim1' of ssh://island.sciencesim.com/home/sceneapi/radams1/bs-opensim into bulletsim1
...
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
2012-03-23 16:20:53 -07:00
Robert Adams
ff54b3c366
BulletSim: change default of shouldDisableContactPoolDynamicAllocation from False to True. It seems that collisions don't happen well when it is False (things fall through terrain).
2012-03-23 15:50:32 -07:00
Robert Adams
3f53b7bc91
BulletSim: Add new configuration parameters to get and set console commands
2012-03-23 13:15:24 -07:00
Robert Adams
142de1d02f
BulletSim: add a bunch of internal Bullet configuration parameters to OpenSimDefaults.ini and the code.
2012-03-23 13:15:23 -07:00
Robert Adams
1273f259e4
BulletSim: remove confusion between angularVelocity and rotationalVelocity (there is still confusion in the rest of OpenSim). Enhance some debug statements to include the object ID.
2012-03-23 13:15:22 -07:00
Robert Adams
2f6e8564fe
BulletSim: add updated (but not working) BulletSim dlls
2012-03-23 13:15:20 -07:00
Robert Adams
1a738caeca
BulletSim: update TODO list. Rearrange code for readability. Add per object friction and restitution runtime settable parameters.
2012-03-23 13:15:18 -07:00
Robert Adams
de24feb275
BulletSim: Add AvatarRestitution parameter. Centralize computation of buoyancy for flying. Tweek avatar default friction and resititution
2012-03-23 13:15:17 -07:00