Dan Lake 1837778cf9 Merge branch 'master' into dev ... Conflicts: OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs		2011-02-14 13:39:27 -08:00
..
storage	Fix: Write asset data into Asset.db when using SQLite	2010-11-13 00:31:02 +00:00
CenomeCache.ini.example	…
FlotsamCache.ini.example	…
Grid.ini	…
GridCommon.ini.example	…
GridHypergrid.ini	…
HyperSimianGrid.ini	…
SimianGrid.ini	…
Standalone.ini	Formatting cleanup.	2010-10-04 17:10:07 -04:00
StandaloneCommon.ini.example	…
StandaloneHypergrid.ini	…