Commit Graph

10 Commits (df7468ffa27b46f074b0f9c6d6c7be4e09164c88)

Author SHA1 Message Date
UbitUmarov 60b08b51b6 remove country from avatars DetectParams, since it is only used on a cm function that can get it directly 2016-08-05 17:08:34 +01:00
UbitUmarov 5aa7a4fa52 fix CM_api compile error 2015-09-03 20:22:39 +01:00
Melanie be4c8c4931 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2013-01-24 00:25:08 +00:00
Melanie 818254916c JustinCC's core re-merge 2013-01-16 15:47:55 +00:00
Melanie 50321fb7bf Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-05-09 00:43:33 +01:00
Melanie ba03e2e262 Add the country functions in the careminster API 2011-02-12 20:59:09 +01:00
Melanie Thielker 7c4cf46bac Rename CM files to LS 2010-06-11 17:42:41 +01:00
Melanie Thielker ad87bab271 Rename cm* function set to ls* (for LightShare) 2010-06-11 17:30:23 +01:00
Melanie 21519d3311 Add missing licenses. Change relicensed LightShare module to proper BSD
licensing.
2010-03-31 13:33:18 +01:00
Melanie 19ae5e5dbb Adding the LightShare module and scripting API. This code was written by
TomMeta and was contributed by Meta7.
2010-03-31 04:23:51 +01:00