Justin Clark-Casey (justincc)
cb41fb64be
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-28 01:06:18 +01:00
Melanie
37603ca6da
Reverse a conditional in XInventory that made updating system folder evrsion numbers impossible
2012-03-27 23:11:06 +01:00
Diva Canto
db5f46fa23
Let grided simulators retrieve the user's inventory skeleton
2012-03-27 15:24:55 -07:00
Justin Clark-Casey (justincc)
b74a89bc12
minor: clean up some code formatting in VivoxVoiceModule.cs
2012-03-27 22:33:42 +01:00
Diva Canto
5e07336672
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 14:25:36 -07:00
Diva Canto
91950b3147
Amend to previous commit regarding the config name. Bugs bite.
2012-03-27 14:24:59 -07:00
Snoopy Pfeffer
19837ff4dd
Two new scripting functions osInviteToGroup(userID) and osEjectFromGroup(userID) that invite/eject users to/from groups the object containing the script is set to. These functions also work for closed groups.
2012-03-27 22:30:02 +02:00
Snoopy Pfeffer
5d37a31436
Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim
2012-03-27 22:16:25 +02:00
Snoopy Pfeffer
7223b63563
User level based restrictions for HyperGrid teleports, asset uploads, group creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
2012-03-27 22:09:58 +02:00
Dan Lake
971d32fda3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 12:51:58 -07:00
Dan Lake
0247d738e2
When loading objects from DB, first add to scene, then call TriggerOnSceneObjectLoaded.
2012-03-27 12:50:58 -07: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
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
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
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
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
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
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
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
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
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
Robert Adams
6ecdadb329
BulletSim: set buoyancy in only one place
2012-03-23 13:15:16 -07:00
Robert Adams
b22d040169
BulletSim: add some new runtime setable parameters to match the dll.
2012-03-23 13:15:14 -07:00
Robert Adams
6c50442625
BulletSim: update BulletSim.dll to Bullet 2.80 and add libBulletSim.so to the new lib32 and lib64 binary directories
2012-03-23 13:15:13 -07:00
Robert Adams
975184b3f9
BulletSim: Update list of TODO tasks
2012-03-23 13:15:11 -07:00
Robert Adams
164706043d
Have the PhysicsParameters module output console command responses
...
directly to the console rather than logging at INFO (which doesn't
output anything for WARN).
There should really be a WriteLine method on ICommandConsole so all
of the different commands don't have to figure out where the command
output should go.
2012-03-23 13:11:58 -07:00