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 |
|