OpenSimMirror/OpenSim
Dan Lake cf15fc0b97 Merge branch 'master' of git://opensimulator.org/git/opensim into dev
Conflicts:
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2011-01-24 20:03:20 -08:00
..
ApplicationPlugins Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-12-04 04:25:08 +00:00
Client Merge branch 'master' of git://opensimulator.org/git/opensim into dev 2011-01-24 20:03:20 -08:00
ConsoleClient Make the text mode remote console really work. It can now be used to send 2010-06-08 22:05:06 +01:00
Data Merge branch 'master' of git://opensimulator.org/git/opensim into dev 2011-01-24 20:03:20 -08:00
Framework Merge branch 'master' of git://opensimulator.org/git/opensim into dev 2011-01-24 20:03:20 -08:00
Region Merge branch 'master' of git://opensimulator.org/git/opensim into dev 2011-01-24 20:03:20 -08:00
Server remove some mono compiler warnings and unnecessary dictionary instantiations 2011-01-21 22:51:52 +00:00
Services Merge branch 'master' of git://opensimulator.org/git/opensim into dev 2011-01-24 20:03:20 -08:00
TestSuite * Fixes issue #4329 "llDialog fails silently" by updating OpenMetaverse.dll 2009-10-30 00:08:41 -07:00
Tests Updates for appearance and attachments 2011-01-06 09:20:59 -08:00
Tools Merge branch 'master' into danmerge 2010-11-30 17:36:36 -08:00