ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-18 22:25:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
e62b14024f35121f1fd83bd6d3cd572ed9ba5897
opensim/OpenSim/Region/ScriptEngine
History
Melanie e62b14024f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-01-04 22:39:07 +00:00
..
Interfaces
Extend default 1 second wait for event completion to other thread script reset (as called by llResetOtherScript()).
2012-12-17 21:37:02 +00:00
Shared
Merge branch 'master' into careminster
2013-01-04 22:39:07 +00:00
XEngine
Merge branch 'master' into careminster
2013-01-02 11:52:37 +00:00