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

diff options

author	Melanie	2013-01-04 22:39:07 +0000
committer	Melanie	2013-01-04 22:39:07 +0000
commit	e62b14024f35121f1fd83bd6d3cd572ed9ba5897 (patch)
tree	987892e6227b79eb45d48c5df0f8b9acfdf30755 /OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
parent	Merge branch 'master' into careminster (diff)
parent	Set default particle burst count to 1 instead of 0 in any set particle system... (diff)
download	opensim-SC-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.zip opensim-SC-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.tar.gz opensim-SC-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.tar.bz2 opensim-SC-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

Diffstat (limited to 'OpenSim/Services/Connectors/Simulation/SimulationDataService.cs')

0 files changed, 0 insertions, 0 deletions