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

..

LindenUDP

Merge branch 'master' into careminster-presence-refactor

2011-02-07 22:08:53 +00:00

ClientStackManager.cs

Formatting cleanup.

2009-10-01 01:17:47 +09:00

IClientNetworkServer.cs

Beginning work on the new LLUDP implementation

2009-10-05 17:38:14 -07:00

RegionApplicationBase.cs

* Added ISimulationDataService and IEstateDataService

2010-09-12 14:20:26 -07:00