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

diff options

author	Melanie	2013-10-04 20:03:12 +0100
committer	Melanie	2013-10-04 20:03:12 +0100
commit	75c68fa29e3a2fed81c883e7925bf161e968639f (patch)
tree	13ba69e6818f634018a5954d38750cf48128b7f8 /OpenSim/Framework/AvatarPickerReplyDataArgs.cs
parent	Merge branch 'avination-current' into careminster (diff)
parent	minor: Disable logging left active on regression test TestSameSimulatorIsolat... (diff)
download	opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.zip opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.gz opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.bz2 opensim-SC_OLD-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

Diffstat (limited to 'OpenSim/Framework/AvatarPickerReplyDataArgs.cs')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: