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
..
Plugins	Merge branch 'master' into careminster	2012-08-18 19:01:05 +01:00
Properties	Added AssemblyInfos to every dll in the OpenSim.Region namespace.	2012-11-14 11:09:43 -08:00
ApiManager.cs	Add osForceAttachToAvatar() and osForceDetachFromAvatar()	2012-04-24 00:03:57 +01:00
AsyncCommandManager.cs	avoid potencial NullReferenceException	2012-11-24 03:39:37 +00:00
CM_Api.cs	Merge branch 'master' into careminster	2012-05-09 00:43:33 +01:00
LSL_Api.cs	Merge branch 'master' into careminster	2013-01-04 22:39:07 +00:00
LS_Api.cs	refactoring for Vector3 operator & constructor tweaks	2012-08-18 13:21:55 +01:00
MOD_Api.cs	minor: Add comment as to why we are pulcking plain old ints out of the LSL_List when converting values from LSL for modInvoke()	2012-10-26 01:50:46 +01:00
OSSL_Api.cs	Merge branch 'master' into careminster	2013-01-04 22:39:07 +00:00