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

diff options

author	Melanie	2012-11-23 03:39:49 +0000
committer	Melanie	2012-11-23 03:39:49 +0000
commit	ae8733bf5943e42f019007ebad951360747d4fc1 (patch)
tree	09b9cb539fc7a3a05067f47628adac7331e8cf28 /bin/assets/TexturesAssetSet/9deab416-9c63-78d6-d558-9a156f12044c.j2c
parent	Add a newline before the constant help text (diff)
parent	Remove the redundant BypassPermissions() checks in EstateManagmentModule. (diff)
download	opensim-SC-ae8733bf5943e42f019007ebad951360747d4fc1.zip opensim-SC-ae8733bf5943e42f019007ebad951360747d4fc1.tar.gz opensim-SC-ae8733bf5943e42f019007ebad951360747d4fc1.tar.bz2 opensim-SC-ae8733bf5943e42f019007ebad951360747d4fc1.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/SceneManager.cs

Diffstat (limited to 'bin/assets/TexturesAssetSet/9deab416-9c63-78d6-d558-9a156f12044c.j2c')

0 files changed, 0 insertions, 0 deletions