opensim-SC - My fork of OpenSim for IG and DG, called SledjChisl.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into careminster	Melanie	2012-03-27	11	-48/+299
\|\ \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
\| *	Let grided simulators retrieve the user's inventory skeleton	Diva Canto	2012-03-27	1	-1/+1
\| \|
\| *	Two new scripting functions osInviteToGroup(userID) and ↵	Snoopy Pfeffer	2012-03-27	5	-23/+183
\| \| \| \| \| \| \| \|	osEjectFromGroup(userID) that invite/eject users to/from groups the object containing the script is set to. These functions also work for closed groups.
\| *	Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim	Snoopy Pfeffer	2012-03-27	1	-1/+1
\| \|\
\| \| *	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	Dan Lake	2012-03-27	120	-1882/+4081
\| \| \|\
\| \| * \|	When loading objects from DB, first add to scene, then call ↵	Dan Lake	2012-03-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	TriggerOnSceneObjectLoaded.
\| * \| \|	User level based restrictions for HyperGrid teleports, asset uploads, group ↵	Snoopy Pfeffer	2012-03-27	6	-23/+117
\| \| \|/ \| \|/\| \| \| \| \| \| \|	creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
* \| \|	Merge branch 'master' into careminster	Melanie	2012-03-27	3	-3/+37
\|\ \ \ \| \|/ /
\| * \|	HG: beginning of a more restrictive inventory access procedure (optional). ↵	Diva Canto	2012-03-27	3	-3/+37
\| \| \| \| \| \| \| \| \| \| \| \|	Experimental: we'll try switching the root folder from under the viewer.
* \| \|	Merge branch 'master' into careminster	Melanie	2012-03-27	4	-11/+48
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	Justin Clark-Casey (justincc)	2012-03-27	10	-137/+519
\| \|\ \
\| \| * \|	BulletSim: make avatar animations update properly.	Robert Adams	2012-03-26	3	-9/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \|	In TerrainModule.cs, the command terrain save-tile is modified to remove an ↵	Garmin Kawaguichi	2012-03-27	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	unnecessary double argument "minimum Y tile"
* \| \| \|	Merge branch 'master' into careminster	Melanie	2012-03-26	7	-44/+151
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Add some more overloads to allow registering overloaded methods and lists	Melanie	2012-03-26	2	-4/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of methods.
\| * \| \|	BulletSim: fix typo introducted by previous checkins (git merge sometimes ↵	Robert Adams	2012-03-26	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	makes mistakes)
\| * \| \|	Merge branch 'bulletsim1'	Robert Adams	2012-03-26	5	-40/+138
\| \|\ \ \
\| \| * \ \	Merge branch 'bulletsim1' of ↵	Robert Adams	2012-03-23	1	-1/+6
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ssh://island.sciencesim.com/home/sceneapi/radams1/bs-opensim into bulletsim1 Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
\| \| \| * \| \|	BulletSim: remove confusion between angularVelocity and rotationalVelocity ↵	Robert Adams	2012-03-22	3	-15/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(there is still confusion in the rest of OpenSim). Enhance some debug statements to include the object ID.
\| \| \| * \| \|	BulletSim: update TODO list. Rearrange code for readability. Add per object ↵	Robert Adams	2012-03-21	2	-17/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	friction and restitution runtime settable parameters.
\| \| \| * \| \|	BulletSim: Add AvatarRestitution parameter. Centralize computation of ↵	Robert Adams	2012-03-21	2	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	buoyancy for flying. Tweek avatar default friction and resititution
\| \| \| * \| \|	BulletSim: set buoyancy in only one place	Robert Adams	2012-03-21	1	-5/+3
\| \| \| \| \| \|
\| \| \| * \| \|	BulletSim: add some new runtime setable parameters to match the dll.	Robert Adams	2012-03-21	2	-7/+16
\| \| \| \| \| \|
\| \| \| * \| \|	BulletSim: Update list of TODO tasks	Robert Adams	2012-03-21	1	-0/+13
\| \| \| \| \| \|
\| \| * \| \| \|	BulletSim: change default of shouldDisableContactPoolDynamicAllocation from ↵	Robert Adams	2012-03-23	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	False to True. It seems that collisions don't happen well when it is False (things fall through terrain).
\| \| * \| \| \|	BulletSim: Add new configuration parameters to get and set console commands	Robert Adams	2012-03-23	1	-4/+32
\| \| \| \| \| \|
\| \| * \| \| \|	BulletSim: add a bunch of internal Bullet configuration parameters to ↵	Robert Adams	2012-03-23	2	-0/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	OpenSimDefaults.ini and the code.
\| \| * \| \| \|	BulletSim: remove confusion between angularVelocity and rotationalVelocity ↵	Robert Adams	2012-03-23	3	-15/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(there is still confusion in the rest of OpenSim). Enhance some debug statements to include the object ID.
\| \| * \| \| \|	BulletSim: update TODO list. Rearrange code for readability. Add per object ↵	Robert Adams	2012-03-23	2	-17/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	friction and restitution runtime settable parameters.
\| \| * \| \| \|	BulletSim: Add AvatarRestitution parameter. Centralize computation of ↵	Robert Adams	2012-03-23	2	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	buoyancy for flying. Tweek avatar default friction and resititution
\| \| * \| \| \|	BulletSim: set buoyancy in only one place	Robert Adams	2012-03-23	1	-5/+3
\| \| \| \| \| \|
\| \| * \| \| \|	BulletSim: add some new runtime setable parameters to match the dll.	Robert Adams	2012-03-23	2	-7/+16
\| \| \| \| \| \|
\| \| * \| \| \|	BulletSim: Update list of TODO tasks	Robert Adams	2012-03-23	1	-0/+13
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2012-03-26	5	-9/+35
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
\| * \| \| \| \|	Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim	Melanie	2012-03-26	1	-1/+11
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
\| \| * \| \| \| \|	Fix compile error in ScriptModuelComms and add some debugging into the modInvoke	Mic Bowman	2012-03-25	1	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	routines to simplify finding method registration issues.
\| * \| \| \| \| \|	Add a hust UUID to the script invocations	Melanie	2012-03-26	5	-9/+25
\| \|/ / / / /
\| * \| \| \| \|	Fix the omission on the interface declaration	Melanie	2012-03-26	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Fix the omission on the interface declaration	Melanie	2012-03-26	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Fix Typo	Melanie	2012-03-26	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2012-03-26	1	-1/+3
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
\| * \| \| \| \|	Further simplify ScriptComms	Melanie	2012-03-26	1	-1/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Dynamically create the delegate type to reduce complexity in the caller	Melanie	2012-03-26	2	-2/+23
\| \| \| \| \| \|
\| * \| \| \| \|	Correct the design error I introduced into ScriptComms. Untested but about to	Melanie	2012-03-26	2	-18/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	be.
* \| \| \| \| \|	Dynamically create the delegate type to reduce complexity in the caller	Melanie	2012-03-26	2	-2/+23
\| \| \| \| \| \|
* \| \| \| \| \|	Correct the design error I introduced into ScriptComms. Untested but about to	Melanie	2012-03-26	2	-18/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	be.
* \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2012-03-25	10	-120/+329
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Simplify the module invocation registration. The types and method name	Melanie	2012-03-25	2	-3/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	can be pulled fromt he delegate so we don't need to pass them explicitly
\| * \| \| \| \|	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	Mic Bowman	2012-03-24	4	-38/+67
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| * \| \| \|	Allow the user to enter help topics in upper or lowercase.	Justin Clark-Casey (justincc)	2012-03-24	1	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Forcing uppercase (e.g. help Assets) is too annoying. Thanks to WhiteStar for pointing this out.