opensim-SC - My fork of OpenSim for IG and DG, called SledjChisl.

diff options

author	Melanie	2012-03-29 00:27:35 +0100
committer	Melanie	2012-03-29 00:27:35 +0100
commit	7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f (patch)
tree	b09be52d5e7838b7c187c92f08f6c2bc73741a42 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp
parent	Merge branch 'master' into careminster (diff)
parent	Add comment about setting client.SceneAgent in AddNewClient() (diff)
download	opensim-SC-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.zip opensim-SC-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.gz opensim-SC-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.bz2 opensim-SC-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs

Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp')

0 files changed, 0 insertions, 0 deletions