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

diff options

author	Melanie	2012-06-21 01:10:13 +0100
committer	Melanie	2012-06-21 01:10:13 +0100
commit	eab211f94d33f9c77a63344072a79cb66707c0ff (patch)
tree	4ec906bf15a6738a1a2443ccc23f83c85ef3fa0b /OpenSim/Region/RegionCombinerModule/RegionConnections.cs
parent	Merge branch 'master' into careminster (diff)
parent	Use HasPrivateAttachmentPoint properties in SOG.DeleteGroupFromScene() instea... (diff)
download	opensim-SC-eab211f94d33f9c77a63344072a79cb66707c0ff.zip opensim-SC-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.gz opensim-SC-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.bz2 opensim-SC-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/RegionConnections.cs')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: