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

diff options

author	Melanie	2013-06-30 18:27:30 +0100
committer	Melanie	2013-06-30 18:27:30 +0100
commit	ffcee82b1d62150b772464841023a29acc334c84 (patch)
tree	957d562be1f9e567daabb9bfdd25e779ec2c11a4 /OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs
parent	Merge branch 'master' into careminster (diff)
parent	Groups V2: charge for group creation only after the group has been successful... (diff)
download	opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.zip opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.tar.gz opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.tar.bz2 opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

Diffstat (limited to 'OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: