3e74a72d2e
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 |
||
---|---|---|
.. | ||
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 |