aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AvatarService/Properties
diff options
context:
space:
mode:
authorMelanie2013-01-04 22:39:07 +0000
committerMelanie2013-01-04 22:39:07 +0000
commite62b14024f35121f1fd83bd6d3cd572ed9ba5897 (patch)
tree987892e6227b79eb45d48c5df0f8b9acfdf30755 /OpenSim/Services/AvatarService/Properties
parentMerge branch 'master' into careminster (diff)
parentSet default particle burst count to 1 instead of 0 in any set particle system... (diff)
downloadopensim-SC_OLD-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.zip
opensim-SC_OLD-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.tar.gz
opensim-SC_OLD-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.tar.bz2
opensim-SC_OLD-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/AvatarService/Properties')
0 files changed, 0 insertions, 0 deletions