opensim-SC_OLD - My fork of OpenSim for IG and MG, called SledjChisl.

diff options

author	Melanie	2012-05-05 10:32:04 +0100
committer	Melanie	2012-05-05 10:32:04 +0100
commit	31ab8b2fe0683cbc9fa4503c616722d678b66e33 (patch)
tree	34fefd4bf9db7eea797db49e75aaaac5080ea94b /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
parent	Merge branch 'avination' (diff)
parent	Fire the scripting changed event with CHANGED_OWNER when an object that has c... (diff)
download	opensim-SC_OLD-31ab8b2fe0683cbc9fa4503c616722d678b66e33.zip opensim-SC_OLD-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.gz opensim-SC_OLD-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.bz2 opensim-SC_OLD-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs

Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: