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

diff options

author	Melanie	2013-08-07 23:29:42 +0100
committer	Melanie	2013-08-07 23:29:42 +0100
commit	005c69511dac490a8353233423a3152abf5580dd (patch)
tree	abae7717af4af3ed7844f3747ab28398fdad9cdf /OpenSim/Services/Connectors/Simulation
parent	Merge branch 'avination-current' into careminster (diff)
parent	minor: add some method doc to ScenePresence fields used for entity transfer, ... (diff)
download	opensim-SC_OLD-005c69511dac490a8353233423a3152abf5580dd.zip opensim-SC_OLD-005c69511dac490a8353233423a3152abf5580dd.tar.gz opensim-SC_OLD-005c69511dac490a8353233423a3152abf5580dd.tar.bz2 opensim-SC_OLD-005c69511dac490a8353233423a3152abf5580dd.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs

Diffstat (limited to 'OpenSim/Services/Connectors/Simulation')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: