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

diff options

author	Melanie	2012-04-30 19:04:38 +0100
committer	Melanie	2012-04-30 19:04:38 +0100
commit	4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6 (patch)
tree	4a1a8386e77f584c900229f1e8ddb08058d07697 /OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
parent	Merge branch 'master' into careminster (diff)
parent	Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on an... (diff)
download	opensim-SC-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.zip opensim-SC-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.gz opensim-SC-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.bz2 opensim-SC-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/MySQLUserAccountData.cs

Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs')

0 files changed, 0 insertions, 0 deletions