Merge branch 'master' into ubitworkmaster

Author UbitUmarov <ajlduarte at sapo dot pt>
Author date 2014-09-09 12:54:00
Author local date 2014-09-09 13:54:00 +0100
Committer UbitUmarov <ajlduarte at sapo dot pt>
Committer date 2014-09-09 12:54:00
Committer local date 2014-09-09 13:54:00 +0100
Commit 46abe0c86d97363378dc86305818b59c262c39e1
Tree e85b4211f7fc1e39df2a83c24039680b19337feb
Parent 683f2cc892d453635ec12f34fd0c8a21bad00926
Parent 347c5b3070f7ce6ecc2a617e09fd02e4616061ba
Merge branch 'master' into ubitworkmaster
Affected files:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
ViewGit