OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
OpenSimMirror/OpenSim
History
Melanie 0bc8238a6c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Watchdog.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 		2012-07-11 03:56:50 +01:00
..
ApplicationPlugins Merge branch 'master' into careminster 2012-06-13 02:15:12 +01:00
Capabilities Merge branch 'avination' into careminster 2012-07-06 20:51:18 +01:00
ConsoleClient
…
Data Merge branch 'master' into careminster 2012-07-11 03:56:50 +01:00
Framework Merge branch 'master' into careminster 2012-07-11 03:56:50 +01:00
Region Merge branch 'master' into careminster 2012-07-11 03:56:50 +01:00
Server Merge branch 'master' into careminster 2012-07-01 03:04:23 +01:00
Services Merge branch 'master' into careminster 2012-07-05 22:17:39 +01:00
Tests Merge branch 'master' into careminster 2012-07-11 03:56:50 +01:00
Tools If logging a client out due to ack timeout, do this asynchronously rather than synchronously on the outgoing packet loop. 2012-06-08 03:53:03 +01:00