Dan Lake 3e74a72d2e Merge branch 'master' into dev ... Conflicts: OpenSim/Client/MXP/ClientStack/MXPClientView.cs OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs		2011-04-28 16:31:40 -07:00
..
storage	…
CenomeCache.ini.example	…
FlotsamCache.ini.example	…
Grid.ini	…
GridCommon.ini.example	…
GridHypergrid.ini	…
HyperSimianGrid.ini	…
SimianGrid.ini	…
Standalone.ini	…
StandaloneCommon.ini.example	…
StandaloneHypergrid.ini	…