Melanie 3889e68c54 Merge branch 'master' into careminster-presence-refactor ... Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs		2011-02-07 22:08:53 +00:00
..
InternetRelayClientView	Implement SendPlacesReply	2010-12-30 01:36:09 +00:00
UDP/Linden	Record number of resent packets in LindenUDP stack and display in stats report	2011-02-02 20:00:50 +00:00