opensim-SC_OLD - My fork of OpenSim for IG and MG, called SledjChisl.

diff options

author	Melanie	2012-03-14 11:33:51 +0000
committer	Melanie	2012-03-14 11:33:51 +0000
commit	c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d (patch)
tree	4b2972bdee4a29c4ecfce11bee9f154c7cdd9873 /OpenSim/Region/ClientStack/Linden
parent	Implement llSetPrimitiveParams for physics shape and material. Add (diff)
parent	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download	opensim-SC_OLD-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.zip opensim-SC_OLD-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.tar.gz opensim-SC_OLD-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.tar.bz2 opensim-SC_OLD-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')

0 files changed, 0 insertions, 0 deletions